Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-07-09

changed backend/smartRuleSystem.js
changed controllers/controllerV0.js
changed controllers/mysql.js
changed frontend/public/views/editRule.html
changed config.json
backend/smartRuleSystem.js Diff Switch to side-by-side view
Loading...
controllers/controllerV0.js Diff Switch to side-by-side view
Loading...
controllers/mysql.js Diff Switch to side-by-side view
Loading...
frontend/public/views/editRule.html Diff Switch to side-by-side view
Loading...
config.json Diff Switch to side-by-side view
Loading...