]> git.evergreen-ils.org Git - Evergreen.git/commit - build/i18n/po/pickup_and_return.js/cs-CZ.po
Merge remote branch 'working/user/dbs/fix-nonfiling-titles'
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 30 Jan 2012 22:16:08 +0000 (17:16 -0500)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 30 Jan 2012 22:16:08 +0000 (17:16 -0500)
commit244e0c8d95beee304caa5f0f17a1137b31569646
tree756ccdcb4d71d30a624d2b614b275b8ac1b9213f
parentf2a40ab35ce77f41eda6a7101026dadd5e8e4380
parent8347b18f4975457c4ef888da99cd269cf220e8de
Merge remote branch 'working/user/dbs/fix-nonfiling-titles'

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/sql/Pg/upgrade/0672.fix-nonfiling-titles.sql