j2blake fe39b61f37 Merge branch 'maint-rel-1.6' into develop		2013-11-07 14:50:09 -05:00
..
config	Line ending for example file.	2013-10-14 10:09:53 -04:00
languages/example	VIVO-435	2013-11-03 17:13:46 -05: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	adding ability to specify page permissions through page management	2013-10-10 14:24:54 -04:00
src	Merge branch 'maint-rel-1.6' into develop	2013-11-07 12:50:52 -05:00
test	Ignore this test - it may fail on a slow machine.	2013-11-07 14:49:12 -05:00
themes/vitro	breaking search portion of page out to include in jsp pages	2013-11-04 11:58:58 -05:00
web	VIVO-500 property deletion updates for faux props	2013-11-06 17:29:19 -05:00
build.xml	VIVO-380 Check that Tomcat exists before trying to deploy to it.	2013-10-24 11:03:50 -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