Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0

Browse Source

# Conflicts:
#	lib/new_views/common_widgets/app_filled_button.dart

main_design2.0

Sikander Saleem 2 years ago

parent 3df1bf70ca b78da03ae5

commit 97555aa3fb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available