Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history 
Conflicts:
	.idea/misc.xml
	app/build.gradle
	app/src/main/res/values-de/strings.xml
	app/src/main/res/values/strings.xml
  • Loading branch information
Tobi Kowalski authored and Tobi Kowalski committed Mar 5, 2017
2 parents 118ea95 + 8e0b17c commit dde2a8b
Show file tree
Hide file tree
Showing 4 changed files with 732 additions and 4 deletions.
Loading

0 comments on commit dde2a8b

Please sign in to comment.