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/3bc5d4c3 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3bc5d4c3 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3bc5d4c3 Branch: refs/heads/develop Commit: 3bc5d4c32df848fa2b56ffe33b4f68faa7fc6a4c Parents: add03e6 3cda9e0 Author: Sebastian Schaffert <[email protected]> Authored: Thu Oct 16 10:15:24 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Oct 16 10:15:24 2014 +0200 ---------------------------------------------------------------------- .../src/main/resources/web/admin/dataview.html | 4 +-- .../versioning/model/MementoVersionSet.java | 4 +-- .../webservices/MementoWebService.java | 34 ++++++++------------ 3 files changed, 18 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
