Merge conflicts

Miguel Rodrigues Miguel Rodrigues 2018-05-12

1 2 3 .. 102 > >> (Page 1 of 102)
added docker-compose.yml
added readme.md
added .gitignore
removed DB
removed DB/creation.sql
removed DB/import.sh
removed backend
removed backend/token
removed backend/token/tokenGenerator.js
removed backend/notificationManager.js
removed backend/routes.js
removed backend/server.js
removed config
removed config/db.js
removed config/email.js
removed controllers
removed controllers/controllerV0.js
removed controllers/emailer.js
removed controllers/mysql.js
removed frontend
removed frontend/public
removed frontend/public/js
removed frontend/public/js/controllers
removed frontend/public/js/controllers/appCtrl.js
removed frontend/public/js/controllers/createAppCtrl.js
docker-compose.yml Diff Switch to side-by-side view
Loading...
readme.md Diff Switch to side-by-side view
Loading...
.gitignore Diff Switch to side-by-side view
Loading...
DB
File was removed.
DB/creation.sql
File was removed.
DB/import.sh
File was removed.
backend
File was removed.
backend/token
File was removed.
backend/notificationManager.js
File was removed.
backend/routes.js
File was removed.
backend/server.js
File was removed.
config
File was removed.
config/db.js
File was removed.
config/email.js
File was removed.
controllers
File was removed.
controllers/controllerV0.js
File was removed.
controllers/emailer.js
File was removed.
controllers/mysql.js
File was removed.
frontend
File was removed.
frontend/public
File was removed.
frontend/public/js
File was removed.
frontend/public/js/controllers
File was removed.
1 2 3 .. 102 > >> (Page 1 of 102)