Skip to content
Snippets Groups Projects
  • alvaro's avatar
    b1dba40b
    Merge remote-tracking branch 'upstream/master' · b1dba40b
    alvaro authored
    Conflicts:
    	doc/examples/originalComponents/services/classes/html.template
    	doc/examples/originalComponents/services/classes/queries/main.query
    	doc/examples/originalComponents/services/instances/html.template
    	doc/examples/originalComponents/services/instances/queries/main.query
    	doc/examples/originalComponents/services/namedGraphs/queries/main.query
    	doc/examples/originalComponents/types/rdfs:Resource/html.template
    	doc/examples/originalComponents/types/rdfs:Resource/queries/po.query
    	doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query
    	utils/defaults/service/html.template
    	utils/defaults/service/queries/main.query
    b1dba40b
    History
    Merge remote-tracking branch 'upstream/master'
    alvaro authored
    Conflicts:
    	doc/examples/originalComponents/services/classes/html.template
    	doc/examples/originalComponents/services/classes/queries/main.query
    	doc/examples/originalComponents/services/instances/html.template
    	doc/examples/originalComponents/services/instances/queries/main.query
    	doc/examples/originalComponents/services/namedGraphs/queries/main.query
    	doc/examples/originalComponents/types/rdfs:Resource/html.template
    	doc/examples/originalComponents/types/rdfs:Resource/queries/po.query
    	doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query
    	utils/defaults/service/html.template
    	utils/defaults/service/queries/main.query