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
Please register or sign in to comment