Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-07

changed controllers/mysql.js
changed frontend/public/views/editRule.html
controllers/mysql.js Diff Switch to side-by-side view
Loading...
frontend/public/views/editRule.html Diff Switch to side-by-side view
Loading...