Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-28

changed backend/notificationManager.js
changed backend/smartRuleSystem.js
backend/notificationManager.js Diff Switch to side-by-side view
Loading...
backend/smartRuleSystem.js Diff Switch to side-by-side view
Loading...