Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7275a000 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7275a000 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7275a000 Branch: refs/heads/develop Commit: 7275a000e3281b52a54b486517c7707f15343899 Parents: d669417 d8252c6 Author: Sebastian Schaffert <[email protected]> Authored: Sun Oct 30 12:45:21 2016 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Sun Oct 30 12:45:21 2016 +0100 ---------------------------------------------------------------------- README.md | 2 ++ .../kiwi/sparql/test/KiWiSparqlTest.java | 19 ++++++++++++++ .../kiwi/sparql/test/MARMOTTA-651_1.sparql | 26 ++++++++++++++++++++ parent/pom.xml | 2 +- .../ldp/webservices/LdpWebServiceTest.java | 7 +++--- .../sparql/webservices/SparqlWebService.java | 2 +- .../src/main/resources/web/admin/sgvizler.html | 4 +-- 7 files changed, 55 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
