Henri-Damien LAURENT d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community ... Conflicts solved: Makefile.PL installer/data/mysql/en/mandatory/sysprefs.sql installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql installer/data/mysql/updatedatabase.pl kohaversion.pl		2010-01-20 23:16:34 +01:00
..
mandatory	Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community	2010-01-20 23:16:34 +01:00
marcflavour	Add MARC21 Fast-add Framework.	2009-06-17 11:51:12 -05:00
optional	Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community	2010-01-20 23:16:34 +01:00