fatima #157

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

4 Commits (main)

Author SHA1 Message Date
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 day ago
Fatimah.Alshammari 287e2b9562 fixed QR 1 day ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 2 days ago
Fatimah.Alshammari 69666a6f6c fixed button 2 days ago