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/4c0e2504 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4c0e2504 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4c0e2504 Branch: refs/heads/develop Commit: 4c0e250460e3e6ba92884f273351194b5a302dfb Parents: 77a532a 1f19579 Author: Sebastian Schaffert <[email protected]> Authored: Wed Dec 11 23:44:03 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Wed Dec 11 23:44:03 2013 +0100 ---------------------------------------------------------------------- .../src/main/resources/web/admin/console.html | 5 +-- .../src/main/resources/web/admin/dataview.html | 34 ++++++++++++++++---- .../src/main/resources/web/admin/about.html | 8 ++--- 3 files changed, 34 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
