You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/11/15 20:46:53 UTC

[3/3] git commit: Merge remote-tracking branch 'origin/develop' into develop

Merge remote-tracking branch 'origin/develop' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1d9325dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1d9325dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1d9325dc

Branch: refs/heads/develop
Commit: 1d9325dc987ede775995e25c313af157c45b4752
Parents: 6f2ef0d 531b151
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Nov 15 20:46:38 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Nov 15 20:46:38 2013 +0100

----------------------------------------------------------------------
 .../platform/core/webservices/resource/MetaWebService.java         | 2 +-
 .../platform/core/webservices/resource/ResourceWebService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------