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/1e30102a Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1e30102a Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1e30102a Branch: refs/heads/develop Commit: 1e30102ae431f010643768a779999d022f9a6229 Parents: d8e0e30 8e0160f Author: Sebastian Schaffert <[email protected]> Authored: Mon Oct 6 11:28:00 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Oct 6 11:28:00 2014 +0200 ---------------------------------------------------------------------- .../marmotta-client-js/src/main/js/marmotta.js | 300 ++++++++++--------- .../platform/ldp/services/LdpServiceImpl.java | 37 ++- 2 files changed, 181 insertions(+), 156 deletions(-) ----------------------------------------------------------------------
