Merge remote-tracking branch 'origin/rel_2_7_1_opac' into rel_2_7_2
authorChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:59:18 +0000 (13:59 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 5 Jan 2015 18:59:18 +0000 (13:59 -0500)
commitf8e6a7c2bb13301418081fe019365e6c3ba01962
tree4749de447b0684eae0d3a59085263f163a6e9ea9
parent83dab26cc5c5ef72aa15a29ea7982697e410df5e
parent6a0500c8b4427401e4f63c392d77ea86a3a447b3
Merge remote-tracking branch 'origin/rel_2_7_1_opac' into rel_2_7_2

Conflicts:
Open-ILS/src/templates/opac/browse.tt2
Open-ILS/src/templates/opac/parts/footer.tt2
Open-ILS/src/templates/opac/parts/record/summary.tt2
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/record/summary.tt2