tworrall 1f66e0eca4 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop ... I have no idea why this is a merge. My develop branch is behind and I want to push changes to git, and this form is what I got.		2013-02-11 16:15:56 -05:00
..
config	VIVO-11 Add delimiters to Freemarker templates	2013-01-25 16:29:17 -05:00
lib	C3P0 library for connection pool	2012-08-30 18:08:41 +00:00
src	VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments.	2013-02-07 16:06:49 -05:00
test	VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments.	2013-02-07 16:06:49 -05:00
themes/vitro	VIVO-12 NIHVIVO-4011 Provide config and GUI for selecting Locale	2013-01-24 16:21:36 -05:00
web	Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop	2013-02-11 16:15:56 -05:00
build.xml	VIVO-2 Modify the build so installers can create a container-neutral VIVO.	2013-01-16 14:54:33 -05:00
context.xml	VIVO-2 Modify the build so installers can create a container-neutral VIVO.	2013-01-16 14:54:33 -05:00
webapp.doxyfile	Improve output: distinguish between failed assertions (failures) and unexpected exceptions (errors), and print a filtered stack trace for any exception.	2010-01-29 22:13:57 +00:00