Merge conflicts

Miguel Rodrigues Miguel Rodrigues 2018-05-12

<< < 1 2 3 4 5 .. 102 > >> (Page 3 of 102)
removed frontend/public/libs/angular-bootstrap/.gitignore
removed frontend/public/libs/angular-bootstrap/.npmignore
removed frontend/public/libs/angular-bootstrap/README.md
removed frontend/public/libs/angular-bootstrap/bower.json
removed frontend/public/libs/angular-bootstrap/index.js
removed frontend/public/libs/angular-bootstrap/package.json
removed frontend/public/libs/angular-bootstrap/ui-bootstrap-csp.css
removed frontend/public/libs/angular-bootstrap/ui-bootstrap-tpls.js
removed frontend/public/libs/angular-bootstrap/ui-bootstrap-tpls.min.js
removed frontend/public/libs/angular-bootstrap/ui-bootstrap.js
removed frontend/public/libs/angular-bootstrap/ui-bootstrap.min.js
removed frontend/public/libs/angular-route
removed frontend/public/libs/angular-route/.bower.json
removed frontend/public/libs/angular-route/LICENSE.md
removed frontend/public/libs/angular-route/README.md
removed frontend/public/libs/angular-route/angular-route.js
removed frontend/public/libs/angular-route/angular-route.min.js
removed frontend/public/libs/angular-route/angular-route.min.js.map
removed frontend/public/libs/angular-route/bower.json
removed frontend/public/libs/angular-route/index.js
removed frontend/public/libs/angular-route/package.json
removed frontend/public/libs/angular-touch
removed frontend/public/libs/angular-touch/.bower.json
removed frontend/public/libs/angular-touch/LICENSE.md
removed frontend/public/libs/angular-touch/README.md
<< < 1 2 3 4 5 .. 102 > >> (Page 3 of 102)