Skip to content
Commit e015693b authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Merge branch 'development' into 'ui-screens' 

# Conflicts:
#   app/src/main/java/cz/muni/consumption/database/FirebaseProxy.kt
#   app/src/main/java/cz/muni/consumption/ui/playSession/selectPlayers/SelectPlayersFragment.kt
parents b78970e5 60ef00b3
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