hudajkhan 525267f40a Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java		2013-09-24 15:10:43 -04:00
..
config	VIVO-262 Document the language support configuration	2013-09-09 14:23:42 -04:00
languages/example	VIVO-289: fixed capitalization issues	2013-09-24 14:58:20 -04:00
lib	Adding unit tests, adding easymock library, Fixed problem with URIs with localnames that start with a digit. VIVO-13	2013-08-30 14:19:13 -04:00
rdf	Merge remote-tracking branch 'origin/develop' into dev-isf	2013-09-23 16:19:05 -04:00
src	Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop	2013-09-24 15:10:43 -04:00
test	Merge remote-tracking branch 'origin/develop' into dev-isf	2013-09-23 16:19:05 -04:00
themes/vitro	some i18n cleanup	2013-05-21 10:55:24 -04:00
web	VIVO-289: fixed capitalization issues	2013-09-24 14:58:20 -04:00
build.xml	VIVO-262 Fix error in build script	2013-09-09 13:39:40 -04: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