h.malik144@gmail.com cb3cf4014d Merge branch 'master' into navigation_implementation ...

# Conflicts:
#	app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentAddItem.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt
#	app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt

2023-09-10 17:02:13 +01:00

1.0 KiB

Raw Blame History

View Raw