• Cédric de Saint Martin's avatar
    Merge branch 'master' into ui_test · f60a2de8
    Cédric de Saint Martin authored
    Something wrong appened at previous merge to master. Cleaning.
    
    Conflicts:
    	master/bt5/vifib_web_ui_test/PathTemplateItem/portal_tests/vifib_web_zuite/TestKVM.xml
    	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test.xml
    	master/bt5/vifib_web_ui_test/SkinTemplateItem/portal_skins/vifib_web_ui_test/Zuite_vifib_instanciation_macro_library.xml
    	master/bt5/vifib_web_ui_test/bt/revision
    f60a2de8
revision 3 Bytes