Merge branch 'main' into bug/filepicker-dismiss · ARK-Builders/ARK-Memo@de2d3ac · GitHub

Commit

Merge branch 'main' into bug/filepicker-dismiss

Browse files

# Conflicts:
#	app/src/main/java/dev/arkbuilders/arkmemo/ui/activities/MainActivity.kt
#	app/src/main/java/dev/arkbuilders/arkmemo/ui/dialogs/FilePickerDialog.kt

Loading branch information

shubertm committed Jan 11, 2024

2 parents fe144f4 + c2332f0 commit de2d3ac