Skip to content
Commit fd80b306 authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Merge branch 'master' into waypoint 

# Conflicts:
#	app/src/main/res/values-de/strings.xml
parents 50468eca 4da9036c
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