Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
eXo Platform
Java JavaScript Groovy HTML

Merge branch 'develop'

Conflicts:
	extension/config/src/main/resources/conf/platform/configuration.properties
	extension/config/src/main/resources/conf/platform/upgrade-4.1.0-to-4.2.0-M2-sample.properties
	extension/config/src/main/resources/conf/platform/upgrade-4.1.0-to-4.2.0-RC1-sample.properties
	extension/config/src/main/resources/conf/platform/upgrade-4.1.1-to-4.2.0-sample.properties
	extension/config/src/main/resources/conf/platform/upgrade-4.2.0-M2-to-4.2.0-RC1-sample.properties
latest commit 889d95bf49
@minhdv minhdv authored
Something went wrong with that request. Please try again.