Réglage conflit
Merge branch 'dev' of git@github.com:soutenanceplanner/soutenanceplanner.git into dev
Merge branch 'dev' of git@github.com:soutenanceplanner/soutenanceplanner.git into dev
Merge branch 'dev' of git@github.com:soutenanceplanner/soutenanceplanner.git into dev
commit
Merge branch 'dev' of git@github.com:soutenanceplanner/soutenanceplanner.git into dev
Ajout des pop-up avec angular-service-dialog