Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c8f067f0 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c8f067f0 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c8f067f0 Branch: refs/heads/MARMOTTA-584 Commit: c8f067f0f0d6735015f26bcc386b3edc1c46cd6d Parents: 28e6dba ff559ea Author: Thomas Kurz <[email protected]> Authored: Wed Apr 20 09:42:56 2016 +0200 Committer: Thomas Kurz <[email protected]> Committed: Wed Apr 20 09:42:56 2016 +0200 ---------------------------------------------------------------------- .../services/test/ng/BaseLDCacheTest.java | 7 +--- .../test/rdf/TestLinkedDataProvider.java | 1 + parent/pom.xml | 2 +- .../src/main/resources/web/admin/about.html | 41 ++++++-------------- .../main/resources/web/admin/configuration.html | 7 +--- .../src/main/resources/web/admin/console.html | 2 +- .../src/main/resources/web/admin/database.html | 2 +- 7 files changed, 20 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
