Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-01

changed backend/notificationManager.js
changed frontend/public/js/controllers/listRules.js
backend/notificationManager.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/listRules.js Diff Switch to side-by-side view
Loading...