-
Develop to QA Develop to QA See merge request !970
-
Conflicts: 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view.html 400-SOURCECODE/AIAHTML5.Web/extract-wp.js 400-SOURCECODE/AIAHTML5.Web/term-number-wp.js 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css
-
Conflicts: 400-SOURCECODE/AIAHTML5.Web/term-number-wp.js 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/bootstrap.css