• Łukasz Nowak's avatar
    Merge remote-tracking branch 'origin/master' into interaction-drop · ebbf73db
    Łukasz Nowak authored
    Conflicts:
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_conversion_server.xml
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_install_bt5.xml
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_kumofs_server.xml
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_mailhost_configuration.xml
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_memcached_server.xml
    	bt5/erp5_promise/PathTemplateItem/portal_alarms/promise_template_tool_configuration.xml
    	bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseMailServer.xml
    	bt5/erp5_promise/bt/description
    	bt5/erp5_promise/bt/revision
    	product/ERP5/ERP5Site.py
    ebbf73db
TemplateTool.py 60.2 KB