1. 30 Jul, 2019 1 commit
  2. 27 Jul, 2019 1 commit
  3. 24 Jul, 2019 1 commit
  4. 23 Jul, 2019 3 commits
  5. 13 Jul, 2019 1 commit
  6. 08 Jul, 2019 4 commits
  7. 17 Jun, 2019 1 commit
  8. 05 Jun, 2019 1 commit
  9. 31 Mar, 2019 1 commit
  10. 14 Mar, 2019 3 commits
  11. 02 Mar, 2019 1 commit
  12. 27 Feb, 2019 4 commits
  13. 26 Feb, 2019 1 commit
  14. 25 Feb, 2019 1 commit
  15. 23 Feb, 2019 1 commit
  16. 21 Feb, 2019 4 commits
  17. 20 Feb, 2019 4 commits
  18. 19 Feb, 2019 5 commits
  19. 18 Feb, 2019 1 commit
  20. 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