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.

Félix MIELCAREK fe281b9ea2 Merge remote-tracking branch 'origin/messagerie_link_view' ... # Conflicts: # .idea/libraries/Dart_Packages.xml # Sources/dafl_project_flutter/lib/controller/controller.dart # Sources/dafl_project_flutter/lib/main.dart # Sources/dafl_project_flutter/lib/model/user.dart # Sources/dafl_project_flutter/lib/views/pages/home/p_home.dart # Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart # Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_settings.dart # Sources/dafl_project_flutter/lib/views/pages/main/w_top.dart # Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart # Sources/dafl_project_flutter/lib/views/pages/sign_up/p_sign_up.dart # Sources/dafl_project_flutter/pubspec.yaml		2 years ago
..
codeStyles	Working with a new server	2 years ago
libraries	Merge remote-tracking branch 'origin/messagerie_link_view'	2 years ago
.gitignore	merge nouvelles vues, splash screen, et icon bureau	3 years ago
Daflv4.iml	Link real username to location script	2 years ago
git_toolbox_prj.xml	Commit newTestPageLocation	3 years ago
modules.xml	merge nouvelles vues, splash screen, et icon bureau	3 years ago
vcs.xml	merge nouvelles vues, splash screen, et icon bureau	3 years ago