hudajkhan 706e0ae1c1 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop ... Conflicts: .gitignore		2013-08-22 15:54:37 -04:00
..
classes/smokeTests	Adding /WEB-INF/classes/smokeTests/vivoTests.txt to the repository.	2011-07-27 19:24:24 +00:00
filegraph/tbox	Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop	2013-08-22 15:54:37 -04:00
ontologies/update	VIVO-248 Move more RDF files into the home directory	2013-08-21 11:27:41 -04:00
resources	VIVO-246 Re-implement the FreemarkerConfiguration	2013-08-08 13:23:40 -04:00
rich-export	updating sparql for rich-export of presentations	2012-06-21 13:56:07 +00:00
visualization	1. Removing dead code belonging to uncached version for temporal graphs.	2011-07-22 23:02:48 +00:00
web.xml	Remove reference to N3EditFormController, which was removed in 0e26d45a31	2013-07-17 15:47:58 -04:00