Skip to content
Commit dc2bd80f authored by Tomáš Houfek's avatar Tomáš Houfek
Browse files

Merge branch '31-collectables' into 'master' 

working collectable

Closes #31

See merge request !31
parents b895f2e5 b42b37fb
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