some edits #2

Merged
sikandersaleem merged 3 commits from majd_development_new into main_latest_merged 2 years ago

3 Commits (master)

Author SHA1 Message Date
nextwo 44654e1e38 some edits 2 years ago
nextwo 3737c3b41c Merge remote-tracking branch 'origin/main_latest_merged' into majd_development_new
# Conflicts:
#	lib/views/pages/user/requests/report/edit_service_report.dart
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
nextwo c58a86758c some edits 2 years ago