old-git.evergreen-ils.org Git - evergreen/pines.git/commit

projects / evergreen / pines.git / commit

author	Chris Sharp <csharp@georgialibraries.org>
	Tue, 12 Nov 2013 18:44:50 +0000 (13:44 -0500)
committer	Chris Sharp <csharp@georgialibraries.org>
	Tue, 12 Nov 2013 18:44:50 +0000 (13:44 -0500)
commit	8a274387ee6e36857f0aeeaac6a721ba86afe870
tree	acac175bd4c7853dd8227df7446f7cb2dccc0d5b	tree
parent	4f56621ff36a867cfe747f6f4924af3f01d8004f	commit \| diff
parent	c1f518005bc50a4cdab21cd523b73e84280656cf	commit \| diff

Merge branch 'rel_2_5_rc1' into 2_5_0_merge_test

Conflicts:
ChangeLog
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_5.txt

Evergreen working repo (PINES)

RSS Atom

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/css/style.css.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/base.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/misc_util.tt2	diff1 \|	diff2 \|	blob \| history
build/tools/make_release	diff1 \|	diff2 \|	blob \| history