1. 20 Dec, 2018 1 commit
    • Diego Rey's avatar
      Merge branch 'develop' · e4567c9e
      Diego Rey authored
      # Conflicts:
      #	Frontend Angular 4/src/app/shared/config.ts
      #	Servidor JEE/pom.xml
      #	Servidor JEE/src/main/resources/META-INF/persistence.xml
      e4567c9e
  2. 18 Dec, 2018 1 commit
  3. 17 Dec, 2018 6 commits
  4. 16 Dec, 2018 3 commits
  5. 15 Dec, 2018 1 commit
  6. 14 Dec, 2018 1 commit
  7. 04 Dec, 2018 1 commit
  8. 27 Nov, 2018 1 commit
  9. 26 Nov, 2018 1 commit
  10. 25 Nov, 2018 12 commits
  11. 24 Nov, 2018 1 commit
  12. 23 Nov, 2018 1 commit
  13. 21 Nov, 2018 1 commit
  14. 20 Nov, 2018 1 commit
  15. 19 Nov, 2018 4 commits
  16. 07 Oct, 2018 1 commit
  17. 02 Oct, 2018 1 commit
  18. 30 Sep, 2018 2 commits