Skip to content
  • Romain Bioteau's avatar
    Merge remote-tracking branch 'origin/BS-12328_form_mapping' into · 0e072ead
    Romain Bioteau authored
    BS-12168_PageBuilder_Integration
    
    Conflicts:
    	bundles/plugins/org.bonitasoft.studio-models/process.ecore
    	bundles/plugins/org.bonitasoft.studio-models/process.genmodel
    	bundles/plugins/org.bonitasoft.studio-models/process.gmfgen
    	bundles/plugins/org.bonitasoft.studio-models/process.gmfmap
    	bundles/plugins/org.bonitasoft.studio-models/process.history
    	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/ExpressionConstants.java
    	bundles/plugins/org.bonitasoft.studio.common/src/org/bonitasoft/studio/common/emf/tools/ModelHelper.java
    	bundles/plugins/org.bonitasoft.studio.diagram/META-INF/MANIFEST.MF
    	bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/widget/ContentAssistText.java
    	bundles/plugins/org.bonitasoft.studio.validation/plugin.xml
    0e072ead