You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Lucas Delanier 822f90f58c Merge remote-tracking branch 'origin/sort_items_discovery' ... # Conflicts: # .idea/libraries/Dart_Packages.xml # .idea/libraries/Dart_SDK.xml # Sources/dafl_project_flutter/lib/model/music.dart # Sources/dafl_project_flutter/lib/model/user.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart		2 years ago
..
api	Petit ajustement	2 years ago
controller	Merge et harmonisation.	2 years ago
exceptions	Suite travail sur playlist Spotify.	2 years ago
model	Merge remote-tracking branch 'origin/sort_items_discovery'	2 years ago
persistence	Merge branche api et master.	2 years ago
position	Merge et harmonisation.	2 years ago
presentation	Ajout de la dernière musique écoutée sur la page profil.	2 years ago
views	Merge remote-tracking branch 'origin/sort_items_discovery'	2 years ago
main.dart	Merge remote-tracking branch 'origin/sort_items_discovery'	2 years ago