Merge branch 'develop'
# Conflicts: # Frontend Angular 4/src/app/shared/config.ts # Servidor JEE/pom.xml # Servidor JEE/src/main/resources/META-INF/persistence.xml
File mode changed from 100644 to 100755
Frontend Angular 4/custom codemirror/search.js
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/e2e/app.e2e-spec.ts
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/e2e/app.po.ts
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/e2e/tsconfig.e2e.json
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/karma.conf.js
100644 → 100755
File mode changed from 100644 to 100755
This source diff could not be displayed because it is too large. You can view the blob instead.
Frontend Angular 4/package.json
100644 → 100755
Frontend Angular 4/protractor.conf.js
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/src/.htaccess
100644 → 100755
File mode changed from 100644 to 100755
File added
Frontend Angular 4/src/app/app-routing.module.ts
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/src/app/app.component.html
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/src/app/app.component.scss
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/src/app/app.component.spec.ts
100644 → 100755
File mode changed from 100644 to 100755
Frontend Angular 4/src/app/app.component.ts
100644 → 100755
Frontend Angular 4/src/app/app.module.ts
100644 → 100755