Skip to content
Commit 76de9dba authored by iNPUTmice's avatar iNPUTmice
Browse files

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

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

Conflicts:
	res/values-ru/strings.xml
parents 8d5f2a91 4d0d35f6
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