old-git.evergreen-ils.org Git - contrib/Conifer.git/commit

author	Dan Scott <dscott@laurentian.ca>
	Fri, 17 Feb 2017 03:39:00 +0000 (22:39 -0500)
committer	Dan Scott <dscott@laurentian.ca>
	Fri, 17 Feb 2017 03:39:00 +0000 (22:39 -0500)
commit	82c8b7bd23bdc5798dce6d0152cc021a69cce6ae
tree	773b1f56cb26c0f9344fbb3fa7725f0d960e35ca	tree
parent	c09220f0bddc3b7f7eafe1e6085ca102db5511bb	commit \| diff
parent	364c3fa7dddaff6c1252eb5f7aa09691a0289e70	commit \| diff

Merge remote-tracking branch 'upstream/rel_2_10' into rel_2_10_mergery_tpac

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Evergreen contribs

Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/002.schema.config.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/030.schema.metabib.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/version-upgrade/2.9.3-2.10.0-upgrade-db.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/record/summary.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/results.tt2	diff1 \|	diff2 \|	blob \| history