Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Conflicts:
	webapp/rdf/display/everytime/pageList.n3
This commit is contained in:
hudajkhan 2013-10-07 17:34:19 -04:00
commit 6be63135d4
6 changed files with 395 additions and 250 deletions

View file

@ -2,6 +2,9 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
#Data getter type labels
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData> rdfs:label "Class Group Page" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> rdfs:label "Browse Page" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter> rdfs:label "Class Group Page - Selected Classes" .