Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-11

changed frontend/public/js/controllers/createAppCtrl.js
changed frontend/public/js/controllers/editRuleCtrl.js
changed frontend/public/js/controllers/listCtrl.js
changed frontend/public/js/controllers/listRules.js
changed frontend/public/js/controllers/rulesCtrl.js
changed frontend/public/js/controllers/statisticsCtrl.js
changed frontend/public/js/controllers/viewCtrl.js
frontend/public/js/controllers/createAppCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/editRuleCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/listCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/listRules.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/rulesCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/statisticsCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/viewCtrl.js Diff Switch to side-by-side view
Loading...