brianjlowe 01281d2034 Merge branch 'develop' into writePerformance ... Conflicts: api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ABoxJenaChangeListener.java api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/ListeningGraph.java		2015-12-14 17:19:32 +02:00
..
src	Merge branch 'develop' into writePerformance	2015-12-14 17:19:32 +02:00
web/js/sparql	Merge branch 'feature/yasqe' of https://github.com/lawlesst/Vitro into lawlesst-feature/yasqe	2015-12-02 15:05:00 +00:00
pom.xml	Maven (second draft)	2015-11-20 21:21:11 +00:00