Commit Graph

8 Commits (fe4b071efbb9f2ea2e089a9f146b1bd06e42b22d)

Author SHA1 Message Date
Sikander Saleem ba1b0ded40 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/pages/land_page/land_page.dart
#	pubspec.yaml
2 years ago
zaid_daoud 1091af7f23 Working On Calendar 2 years ago
Sikander Saleem 49377d2418 calender cont. 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
zaid_daoud 905e430549 Enhancements 2 years ago
zaid_daoud 06152bee2f Fix Bottom Nav Bar Style 2 years ago
zaid_daoud dd524bcbd1 Merged with Majd 2 years ago