Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-01

changed backend/notificationManager.js
changed controllers/mysql.js
changed readme.md
backend/notificationManager.js Diff Switch to side-by-side view
Loading...
controllers/mysql.js Diff Switch to side-by-side view
Loading...
readme.md Diff Switch to side-by-side view
Loading...