Merge branch 'develop' into feature/fauxEditing

This commit is contained in:
Jim Blake 2014-12-08 15:55:32 -05:00
commit 875ba66a46
36 changed files with 1709 additions and 1058 deletions

View file

@ -34,6 +34,7 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.RemoveObsoletePermissions
edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
#edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase