Skip to content
Commit d3391d08 authored by Michaela Greplová's avatar Michaela Greplová
Browse files

Merge branch 'main' into 'CreateAndEditCategory' 

# Conflicts:
#   app/src/main/java/cz/muni/sutralog/ui/list/CategoryListFragment.kt
#   app/src/main/java/cz/muni/sutralog/ui/list/RockListFragment.kt
parents 8789d721 0992f0dd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment