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

Aamir Muhammad 2f22519d86 Merge remote-tracking branch 'origin/sultan-dev' into development_aamir ... # Conflicts: # android/app/src/main/AndroidManifest.xml # android/gradle/wrapper/gradle-wrapper.properties # lib/api/chat/chat_api_client.dart # lib/app_state/app_state.dart # lib/classes/consts.dart # lib/generated_plugin_registrant.dart # lib/main.dart # lib/provider/chat_provider_model.dart # lib/ui/chat/group_chat_detaied_screen.dart # lib/ui/landing/dashboard_screen.dart # lib/ui/login/login_screen.dart # lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart # lib/widgets/image_picker.dart # pubspec.yaml		2 years ago
..
app	Merge remote-tracking branch 'origin/sultan-dev' into development_aamir	2 years ago
gradle/wrapper	Merge remote-tracking branch 'origin/sultan-dev' into development_aamir	2 years ago
.gitignore	first commit	4 years ago
build.gradle	Merge branch 'master' into development_aamir	2 years ago
gradle.properties	Added UI Components for Marathon Module.. WIP	3 years ago
settings.gradle	first commit	4 years ago