Merge branch 'master' into 'Issue4'
# Conflicts: # src/main/java/fr/unantes/software/construction/calendar/Correspondence.java # src/main/java/fr/unantes/software/construction/calendar/Travel.java # src/test/java/fr/unantes/software/construction/calendar/CalendarTest.java # src/test/java/fr/unantes/software/construction/calendar/CorrespondenceTest.java # src/test/java/fr/unantes/software/construction/calendar/TravelTest.java
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Affichage de
- src/main/java/fr/unantes/software/construction/calendar/Correspondence.java 8 ajouts, 1 suppression...nantes/software/construction/calendar/Correspondence.java
- src/main/java/fr/unantes/software/construction/calendar/Travel.java 15 ajouts, 1 suppression...ava/fr/unantes/software/construction/calendar/Travel.java
- src/main/java/fr/unantes/software/construction/security/Controller.java 45 ajouts, 0 suppression...fr/unantes/software/construction/security/Controller.java
- src/main/java/fr/unantes/software/construction/security/PasswordManager.java 74 ajouts, 0 suppression...antes/software/construction/security/PasswordManager.java
- src/main/java/fr/unantes/software/construction/security/UserManager.java 14 ajouts, 49 suppressions...r/unantes/software/construction/security/UserManager.java
- src/test/java/fr/unantes/software/construction/calendar/CalendarTest.java 1 ajout, 1 suppression.../unantes/software/construction/calendar/CalendarTest.java
- src/test/java/fr/unantes/software/construction/calendar/CorrespondenceTest.java 2 ajouts, 3 suppressions...es/software/construction/calendar/CorrespondenceTest.java
- src/test/java/fr/unantes/software/construction/calendar/TravelTest.java 1 ajout, 1 suppression...fr/unantes/software/construction/calendar/TravelTest.java
Veuillez vous inscrire ou vous se connecter pour commenter