Merge conflicts

Miguel Rodrigues Miguel Rodrigues 2018-05-12

<< < 1 2 3 4 .. 102 > >> (Page 2 of 102)
removed frontend/public/js/controllers/deleteCtrl.js
removed frontend/public/js/controllers/deleteRuleCtrl.js
removed frontend/public/js/controllers/listCtrl.js
removed frontend/public/js/controllers/main.js
removed frontend/public/js/controllers/routes.js
removed frontend/public/js/controllers/rulesCtrl.js
removed frontend/public/js/controllers/viewCtrl.js
removed frontend/public/js/csv
removed frontend/public/js/csv/readCSV.js
removed frontend/public/js/services
removed frontend/public/js/services/appService.js
removed frontend/public/js/services/notifyservice.js
removed frontend/public/libs
removed frontend/public/libs/angular-animate
removed frontend/public/libs/angular-animate/.bower.json
removed frontend/public/libs/angular-animate/LICENSE.md
removed frontend/public/libs/angular-animate/README.md
removed frontend/public/libs/angular-animate/angular-animate.js
removed frontend/public/libs/angular-animate/angular-animate.min.js
removed frontend/public/libs/angular-animate/angular-animate.min.js.map
removed frontend/public/libs/angular-animate/bower.json
removed frontend/public/libs/angular-animate/index.js
removed frontend/public/libs/angular-animate/package.json
removed frontend/public/libs/angular-bootstrap
removed frontend/public/libs/angular-bootstrap/.bower.json
frontend/public/js/csv
File was removed.
frontend/public/js/services
File was removed.
frontend/public/libs
File was removed.
<< < 1 2 3 4 .. 102 > >> (Page 2 of 102)