Skip to content
Commit 91e50a97 authored by masensio's avatar masensio
Browse files

Merge branch 'transifex' into setup_app_name 

Conflicts:
	res/values-ko/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-tr/strings.xml
parents 74883454 dc70f9e8
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