projects / evergreen / pines.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ad54049 09d20a1)
Merge branch 'rel_2_9_0' into rel_2_9_1
authorChris Sharp <csharp@georgialibraries.org>
Sat, 19 Dec 2015 15:30:03 +0000 (10:30 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Sat, 19 Dec 2015 15:30:03 +0000 (10:30 -0500)
commitb1f83e0478f9fdeb65e377c72c3c37a922f42697
tree6a6056b54aa2acb6b1708643d2dd4a8748e5712atree
parentad54049f3180ab5128862594cc8b6b38c5aeff8bcommit | diff
parent09d20a16b129ac0a450fddd3ca20f09133b02261commit | diff
Merge branch 'rel_2_9_0' into rel_2_9_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
docs/RELEASE_NOTES_2_9.txt
Open-ILS/src/templates/opac/parts/misc_util.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/opac/parts/place_hold.tt2 diff1 | diff2 | blob | history
Open-ILS/src/templates/opac/parts/result/table.tt2 diff1 | diff2 | blob | history
Evergreen working repo (PINES)