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/12/10 17:21:49 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/develop' into
develop
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
platform/backends/marmotta-backend-kiwi/src/main/resources/web/admin/console.html
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5ede5163
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5ede5163
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5ede5163
Branch: refs/heads/develop
Commit: 5ede516336f6c184d8f722418f520f73c0fd7cdd
Parents: 92e6601 a097b4e
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Dec 10 17:21:32 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Dec 10 17:21:32 2013 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------