Merge branch 'tpac_hsn_2_4' into rel_2_4_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Thu, 28 Aug 2014 15:03:50 +0000 (11:03 -0400)
committerDan Scott <dscott@laurentian.ca>
Thu, 28 Aug 2014 15:03:50 +0000 (11:03 -0400)
commit14314e7a28e496e615382df093392d64ca4859e8
tree76272a7f0ac0af6ee4c143c7b6407911fe01e16a
parent16c75f786877379d24170500edaf54abeeeb45b7
parent9579f107b847010e46209de2f17c43ec80d69361
Merge branch 'tpac_hsn_2_4' into rel_2_4_mergery_tpac

Conflicts:
Open-ILS/src/templates_hrsrh/opac/parts/footer.tt2
Open-ILS/src/templates_hrsrh/opac/parts/topnav_links.tt2
Open-ILS/web/images/hrsrh_logo.png
Open-ILS/web/images/hrsrh_logo_small.png