You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/03/18 09:19:20 UTC
[6/6] git commit: Merge branch 'MARMOTTA-189' into develop
Merge branch 'MARMOTTA-189' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/47ee5ac9
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/47ee5ac9
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/47ee5ac9
Branch: refs/heads/develop
Commit: 47ee5ac9733bd1f24fc14fe43ea8bffa06ff9132
Parents: eddba62 3426b3f
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Mar 18 09:15:54 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Mar 18 09:15:54 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/installer/LICENSE.txt | 1 +
.../templating/TemplatingServiceImpl.java | 2 +
platform/marmotta-versioning-kiwi/pom.xml | 8 ++++
.../resources/templates/memento_timemap.ftl | 44 +++++++++++++++++++-
4 files changed, 54 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/47ee5ac9/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
----------------------------------------------------------------------