Commit c8fd7190 authored by Danila Mazour's avatar Danila Mazour
Browse files

Merge branch 'master' into dev

# Conflicts:
#	bundle-tests/pom.xml
#	community/bonita-war/pom.xml
#	community/pom.xml
#	community/resources/api-extension-example/pom.xml
#	community/resources/api-extension-viewer/pom.xml
#	community/resources/bonita-theme-archetype/pom.xml
#	community/resources/bonita-theme/pom.xml
#	community/resources/bootstrap-default-theme/pom.xml
#	community/resources/example/pom.xml
#	community/resources/groovy-example/pom.xml
#	community/resources/html-example/pom.xml
#	community/resources/looknfeel/pom.xml
#	community/resources/pom.xml
#	community/resources/process-autogenerated-form/pom.xml
#	community/resources/step-autogenerated-form/pom.xml
#	community/tomcat-resources/bonita-tomcat-juli/pom.xml
#	community/tomcat-resources/pom.xml
#	community/tomcat-resources/tomcat-distrib-for-bonita/pom.xml
#	community/tomcat-resources/tomcat-jta/pom.xml
#	community/tomcat/pom.xml
#	pom.xml
#	subscription/bonita-war/pom.xml
#	subscription/pom.xml
#	subscription/resources/cosmo-theme/pom.xml
#	subscription/resources/flatly-theme/pom.xml
#	subscription/resources/pom.xml
#	subscription/resources/readable-theme/pom.xml
#	subscription/resources/simplex-theme/pom.xml
#	subscription/resources/superhero-theme/pom.xml
#	subscription/tomcat/pom.xml
parents cc195fb2 da22c85f
Markdown is supported
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