Merge remote-tracking branch 'origin/develop' into dev-isf

Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
This commit is contained in:
brianjlowe 2013-09-23 16:19:05 -04:00
commit 90512bdc1c
16 changed files with 893 additions and 409 deletions

View file

@ -13,7 +13,7 @@ rdf:type
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
"true"^^xsd:boolean ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
"true"^^xsd:boolean .
"true"^^xsd:boolean .
display:requiresAction
@ -24,5 +24,5 @@ display:requiresAction
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
"true"^^xsd:boolean ;
<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
"true"^^xsd:boolean .
"true"^^xsd:boolean .