projects / koha-ffzg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d339abf)
Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
authorHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 20 Jan 2010 22:16:34 +0000 (23:16 +0100)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 20 Jan 2010 22:16:34 +0000 (23:16 +0100)
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


No differences found
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git