projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Evergreen ILS