Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-28

changed controllers/controllerV0.js
changed controllers/httpRequest.js
changed controllers/mysql.js
changed frontend/public/js/controllers/editRuleCtrl.js
controllers/controllerV0.js Diff Switch to side-by-side view
Loading...
controllers/httpRequest.js Diff Switch to side-by-side view
Loading...
controllers/mysql.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/editRuleCtrl.js Diff Switch to side-by-side view
Loading...