204 commits

Author	SHA1	Message	Date
iNPUTmice	cd5a56e8e7	show avatar in editaccount	2014-11-04 17:38:41 +01:00
iNPUTmice	d458919c8f	unfinishd qr code implemenation. thanks to @emdete	2014-11-03 22:47:07 +01:00
Sam Whited	46f147a82c	Merge branch 'gradle' into development ... Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib	2014-10-30 15:33:13 -04:00
Sam Whited	281ce3105f	Make conversations the root project	2014-10-22 15:47:11 -04:00

Renamed from conversations/src/main/res/values/strings.xml (Browse further)