Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-05-28

changed backend/notificationManager.js
changed controllers/mysql.js
changed frontend/public/js/controllers/statisticsCtrl.js
changed frontend/public/views/notificationStatistics.html
backend/notificationManager.js Diff Switch to side-by-side view
Loading...
controllers/mysql.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/views/notificationStatistics.html Diff Switch to side-by-side view
Loading...