Merge remote-tracking branch 'conifer/feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac
authorDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:28:51 +0000 (13:28 -0500)
committerDan Scott <dscott@laurentian.ca>
Thu, 22 Jan 2015 18:28:51 +0000 (13:28 -0500)
commit27118c310365a30618cba4b9f855daf04cddaffa
tree230e011171558a6229b6db52dbe3fd63a8568531
parent5d6df8b2413a70138637541c83ecf22ef063ba18
parent6e454d57056486d06be2cb0cafc51be2909f4acc
Merge remote-tracking branch 'conifer/feature/tpac_conifer_2_7' into rel_2_7_mergery_tpac
Open-ILS/src/templates/opac/results.tt2