Skip to content
Commit 4b227f22 authored by xbrosz's avatar xbrosz
Browse files

Merge branch 'main' into rock_filtering 

# Conflicts:
#	app/src/main/java/cz/muni/sutralog/data/RockPresentableListItem.kt
#	app/src/main/java/cz/muni/sutralog/ui/list/RockListFragment.kt
parents 10d84a6c 03dd22f8
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