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/e5eb3a1c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/e5eb3a1c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/e5eb3a1c Branch: refs/heads/MARMOTTA-556 Commit: e5eb3a1c163cc093b1e4eb866973e79c21c71bc7 Parents: 261bd81 3653f4b Author: Raffaele Palmieri <[email protected]> Authored: Tue Apr 7 20:41:55 2015 +0200 Committer: Raffaele Palmieri <[email protected]> Committed: Tue Apr 7 20:41:55 2015 +0200 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/e5eb3a1c/launchers/marmotta-webapp/pom.xml ----------------------------------------------------------------------
