dev_aamir #8

Merged

Haroon6138 merged 19 commits from dev_aamir into master

aamir.muhammad commented

Collaborator

changes

aamir.muhammad added 19 commits

ea15bd9152 bottom sheet

8ed8637108 Merge branch 'refs/heads/master' into dev_aamir

# Conflicts:
#	lib/presentation/authantication/login.dart

a4da9db6c3 register & changes

9c52a6122f Merge branch 'master' into dev_aamir

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/authantication/login.dart

6f98690929 register & changes

5e292544d7 Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir

# Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart

8f1e4500cc register & Exception bottom sheet, country dropdown.

67e580447e changes

23a4035117 Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart

d1e1154bdb changes

ed24365eff Merge branch 'master' into dev_aamir

# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart

7321da67e3 register step 2 & fixes

85fac13314 changes

cf1908b44a Merge branch 'master' into dev_aamir

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart

0309299f44 changes

e41ffd583d changes

3855ba276f calender & signup fixes.

da035650c0 Merge branch 'master' into dev_aamir

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart

c27d7301d9 calender & signup fixes.

Haroon6138 merged commit 24b98626d2 into master 2 months ago

Haroon6138 referenced this issue from a commit

Merge pull request 'dev_aamir' (#8) from dev_aamir into master

The pull request has been merged as 24b98626d2.

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 dev_aamir master

git pull origin dev_aamir

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff dev_aamir

git push origin master

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.

Loading…

There is no content yet.

Labels Milestones

dev_aamir #8

Step 1:

Step 2: