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.
hmg-mohemm-flutter-app/lib
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
6 months ago
..
api Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
app_state App update to stores, Version ID 8.9 8 months ago
classes Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
config event activity page added. 12 months ago
dialogs Merge branch 'master' into mohem_flutter_upgrade 7 months ago
exceptions
extensions
generated Merge branch 'master' into mohem_flutter_upgrade 6 months ago
models Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
provider Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
theme upgraded 7 months ago
ui Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
widgets Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 6 months ago
generated_plugin_registrant.dart actions & attachment api response overlapping other request responses. fixed. 1 year ago
main.dart time sheet changes 9 months ago
start_term_approval_process_list_model.dart