Skip to content
Commit 545cad41 authored by iNPUTmice's avatar iNPUTmice
Browse files

Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development 

Conflicts:
	res/values-eu/strings.xml
parents 49b7c777 b16bc24c
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