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 d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade ... # Conflicts: # android/app/build.gradle # android/build.gradle # android/gradle.properties # android/gradle/wrapper/gradle-wrapper.properties # android/settings.gradle # ios/Runner.xcodeproj/project.pbxproj # lib/api/dashboard_api_client.dart # lib/classes/consts.dart # lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart # lib/widgets/mark_attendance_widget.dart # pubspec.yaml		3 months ago
..
app	Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade	3 months ago
gradle/wrapper	upgraded the sdk to 35	3 months ago
.gitignore	first commit	4 years ago
build.gradle	upgraded the sdk to 35	3 months ago
gradle.properties	logins apis	4 months ago
settings.gradle	Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade	3 months ago