projects / koha_fer / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b1b0d88) | patch
Bug 6739: (follow-up) fix conflicts with some others bugs.
authorJonathan Druart <jonathan.druart@biblibre.com>
Wed, 15 Jan 2014 10:38:38 +0000 (11:38 +0100)
committerGalen Charlton <gmc@esilibrary.com>
Mon, 5 May 2014 01:55:00 +0000 (01:55 +0000)
commitfd3985eb6c94e06007ec0af364ae672e766775b1
tree3d7f05b8bb64765e8e8e47ce89985cdb1c936f11tree | snapshot
parentb1b0d88e114357a7bb4adb6d1a55c7dd767796c1commit | diff
Bug 6739: (follow-up) fix conflicts with some others bugs.

See comments 86 and 88. This patch fixes a bad conflict resolution in a
previous patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
installer/data/mysql/updatedatabase.pl diff | blob | history
opac/opac-user.pl diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.