projects / evergreen / pines.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aaecd05 3f089df)
Merge branch 'rel_2_5_0' into rel_2_5_1
authorChris Sharp <csharp@georgialibraries.org>
Thu, 5 Dec 2013 16:07:24 +0000 (11:07 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 5 Dec 2013 16:07:24 +0000 (11:07 -0500)
commitc76544f34aca3b91123bd0158632071f5d4755ae
tree9ade79e1d21e2a74ed86bfee2c0f596d170447f4tree
parentaaecd05f29ad273e8b39c1c5dbeb186482bbe842commit | diff
parent3f089df3c8c06d6ee8258deb62174c1ac1be3c8fcommit | diff
Merge branch 'rel_2_5_0' into rel_2_5_1

Conflicts:
ChangeLog
Open-ILS/src/perlmods/lib/OpenILS.pm
Open-ILS/src/perlmods/lib/OpenILS/Application.pm
Open-ILS/src/sql/Pg/002.schema.config.sql
Open-ILS/xul/staff_client/chrome/content/main/about.html
Open-ILS/xul/staff_client/defaults/preferences/prefs.js
README
configure.ac
Open-ILS/src/templates/opac/css/style.css.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/opac/parts/record/copy_table.tt2 diff1 | diff2 | blob | history
Evergreen working repo (PINES)