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

Merge branch 'rel_3_3' of git://git.evergreen-ils.org/Evergreen into HEAD

Signed-off-by: Dan Scott <dan@coffeecode.net>

Evergreen contribs

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/templates/opac/parts/js.tt2	diff1 \|	diff2 \|	blob \| history
docs/admin/circulation_limit_groups.adoc	diff1 \|	diff2 \|	blob \| history