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
pom.xml	Move dependencies into a pom project so that they can be referenced in projects that "shade" the vitro-api	2015-11-21 16:48:35 +00:00