projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4744ed9 aecf197)
Merge branch 'user/paxed/i18n-xul-values' of git://git.evergreen-ils.org/working... user/paxed/i18n-xul-values
authorPasi Kallinen <pasi.kallinen@pttk.fi>
Mon, 3 Jun 2013 08:47:53 +0000 (11:47 +0300)
committerPasi Kallinen <pasi.kallinen@pttk.fi>
Mon, 3 Jun 2013 08:48:14 +0000 (11:48 +0300)
commit902e5428fbc4d0df7e9293975566621cc7457da2
treecd2700809ba6300bc7195e90aaf8ec2cef1bbe94tree
parent4744ed91a76d23bb0304b8333895111ef5333cf2commit | diff
parentaecf19719d029ccb2b9939ea2e80df50d5f27eedcommit | diff
Merge branch 'user/paxed/i18n-xul-values' of git://git.evergreen-ils.org/working/Evergreen into i18n-xul-values

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Conflicts:
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/xul/staff_client/server/serial/manage_subs.xul
Evergreen ILS