Graham Triggs a8bd8829db Merge branch 'develop' into feature/theming ... # Conflicts: # webapp/src/main/webapp/themes/vitro/templates/footer.ftl # webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl # webapp/src/main/webapp/themes/vitro/templates/head.ftl		2017-05-22 16:57:20 +01:00
..
src/main	Merge branch 'develop' into feature/theming	2017-05-22 16:57:20 +01:00
pom.xml	Update version numbers	2016-10-31 19:46:39 +00:00