Merge branch 'master' of git.evergreen-ils.org:/contrib/Conifer into rel_2_11_mergery... rel_2_11_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Sun, 31 Jul 2016 18:09:27 +0000 (14:09 -0400)
committerDan Scott <dscott@laurentian.ca>
Sun, 31 Jul 2016 18:09:27 +0000 (14:09 -0400)
commit03dd1482af77f2615ba41c4886cc3e435b4d52b5
treefff0c575033f4e91232c23f305b237c34e21a8fc
parent62ee2baa46bfe885bad09fbc5e3a4a2520ff0e16
parentd5ce5929495c31eeac6bfdc3df6bd3e275a3ed0d
Merge branch 'master' of git.evergreen-ils.org:/contrib/Conifer into rel_2_11_mergery_tpac
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Open-ILS/src/templates/opac/parts/advanced/search.tt2
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/templates/opac/parts/searchbar.tt2