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

projects / contrib / Conifer.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3a3aded 75604c8)

author	Dan Scott <dscott@laurentian.ca>
	Thu, 13 Jul 2017 19:19:56 +0000 (15:19 -0400)
committer	Dan Scott <dscott@laurentian.ca>
	Thu, 13 Jul 2017 19:19:56 +0000 (15:19 -0400)
commit	83840398d5d2973ed2e20c087fc7ee66c622727b
tree	f7283300ac3d6d2bee69541466d97066666c4a32	tree
parent	3a3aded5b5c1a7f8b20774d2660768120f0bb14d	commit \| diff
parent	75604c81b5735b238e533877bf81fa4fb429815d	commit \| diff

Merge branch 'rel_2_12' of git.evergreen-ils.org:Evergreen into rel_2_12_mergery_tpac

19 files changed:

Open-ILS/examples/opensrf.xml.example	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/actor.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/reporter/clark-kent.pl	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/acq/common/li_table.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/advanced/search.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/record/authors.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/result/paginate.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/opac/parts/searchbar.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/staff/circ/patron/t_edit.tt2	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2	diff1 \|	diff2 \|	blob \| history
build/i18n/po/cat.properties/cat.properties.pot	diff1 \|	diff2 \|	blob \| history
build/i18n/po/circ.properties/circ.properties.pot	diff1 \|	diff2 \|	blob \| history
build/i18n/po/common.properties/common.properties.pot	diff1 \|	diff2 \|	blob \| history
build/i18n/po/tpac/fr-CA.po	diff1 \|	diff2 \|	blob \| history
build/i18n/po/tpac/tpac.pot	diff1 \|	diff2 \|	blob \| history

Evergreen contribs