development_haroon #5

Merged
Haroon6138 merged 13 commits from development_haroon into master 2 years ago
Owner
There is no content yet.
Haroon6138 added 13 commits 2 years ago
fd6058e87d Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
Haroon6138 merged commit 0589a55c8d into master 2 years ago
The pull request has been merged as 0589a55c8d.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b development_haroon master
git pull origin development_haroon

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff development_haroon
git push origin master
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/mohemm-flutter-app#5
Loading…
There is no content yet.