Repaired merge conflicts resuling from ttopac-move-templates
[working/Evergreen.git] / Open-ILS / src / templates / default / cat / authority / list.tt2
2011-08-03 Bill EricksonRepaired merge conflicts resuling from ttopac-move...
2011-06-30 Dan ScottMerge branch 'dbs/ttopac-move-templates' into dbs/templ... user/dbs/template-toolkit-integration-on-master
2011-06-30 Dan ScottMove templates out of a web-served directory user/dbs/ttopac-move-templates