Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
# By Sergio Fernández # Via Sergio Fernández * 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta: MARMOTTA-431: last details MARMOTTA-431: fixed missing arch in the .deb file Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/db610014 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/db610014 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/db610014 Branch: refs/heads/ldp Commit: db61001401728f8990c0768cde8995b363b1056a Parents: da95d01 5fa42d2 Author: Rupert Westenthaler <[email protected]> Authored: Mon Feb 24 10:17:53 2014 +0100 Committer: Rupert Westenthaler <[email protected]> Committed: Mon Feb 24 10:17:53 2014 +0100 ---------------------------------------------------------------------- launchers/marmotta-webapp/pom.xml | 18 ++++++++++++++++-- launchers/marmotta-webapp/src/deb/control/control | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
