vitro/webapp/web/templates
brianjlowe 90512bdc1c Merge remote-tracking branch 'origin/develop' into dev-isf
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
2013-09-23 16:19:05 -04:00
..
alpha Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
edit Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
entity Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
error Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
freemarker Merge remote-tracking branch 'origin/develop' into dev-isf 2013-09-23 16:19:05 -04:00
page Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
parts Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
README.txt Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00

templates directory is for jsp files that are used
to format data.  They are views, templates and such.

bdc34.