fatima #191

Merged
Haroon6138 merged 9 commits from fatima into master 1 day ago

9 Commits (main)

Author SHA1 Message Date
Fatimah.Alshammari ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
1 day ago
Fatimah.Alshammari 8368dbd4d9 fixed Ar and En files 1 day ago
Fatimah.Alshammari cf3c14281c fixed Ar En files 6 days ago
Fatimah.Alshammari 46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
1 week ago
Fatimah.Alshammari 47ec43850d Merge branch 'master' into fatima 2 weeks ago
Fatimah.Alshammari 0d6d23dbbc Merge branch 'master' into fatima 3 weeks ago
Fatimah.Alshammari f340f4fb8f Merge branch 'master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
3 weeks ago
Fatimah.Alshammari 931e3fa968 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
1 month ago
Fatimah.Alshammari d027415302 fixed errors 1 month ago