]>
git.argeo.org Git - gpl/argeo-suite.git/commit - org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
Merge remote-tracking branch 'origin/unstable' into testing
Conflicts:
cnf/build.bnd
dep/org.argeo.suite.dep.e4.rap/pom.xml
dep/org.argeo.suite.dep.e4.rcp/pom.xml
dep/org.argeo.suite.dep.ui.rap/pom.xml
dep/pom.xml
dist/argeo-suite-standard/pom.xml
dist/pom.xml
lib/pom.xml
org.argeo.entity.api/pom.xml
org.argeo.entity.core/pom.xml
org.argeo.entity.ui/pom.xml
org.argeo.geo.ui/pom.xml
org.argeo.library.ui/pom.xml
org.argeo.people.ui/pom.xml
org.argeo.publishing.ui/pom.xml
org.argeo.suite.core/pom.xml
org.argeo.suite.theme.default/pom.xml
org.argeo.suite.ui.rap/pom.xml
org.argeo.suite.ui/pom.xml
org.argeo.support.geonames/pom.xml
org.argeo.support.odk/pom.xml
org.argeo.support.xforms/pom.xml
pom.xml