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

Merge branch 'main' into 'rockDetailNewDesign'

# Conflicts:
#   app/src/main/res/layout/rock_detail.xml
parents 213ed8d4 40a0c607
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