Skip to content
Commit 9a596e7c authored by abirembaut's avatar abirembaut
Browse files

Merge branch 'release-7.15.0' into dev

# Conflicts:
#	community/server/src/main/java/org/bonitasoft/console/common/server/page/CustomPageService.java
#	community/server/src/main/java/org/bonitasoft/console/common/server/page/RestApiRenderer.java
#	community/server/src/main/java/org/bonitasoft/console/common/server/page/extension/PageResourceProviderImpl.java
#	community/server/src/main/java/org/bonitasoft/web/rest/server/datastore/page/PageDatastore.java
#	community/server/src/test/java/org/bonitasoft/console/common/server/page/CustomPageServiceTest.java
#	community/server/src/test/java/org/bonitasoft/web/rest/server/datastore/page/PageDatastoreTest.java
parents f5075101 4f9f9c0c
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment