Skip to content
Commit 1f32089e authored by kruks23's avatar kruks23
Browse files

Merge remote-tracking branch 'origin/development' into development 

Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml
parents 3d913c2e 0578fb38
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