Commit graph

5 commits

Author SHA1 Message Date
Daniel Gultsch f58b2afcaa changed switch widget 2015-07-18 19:38:52 +02:00
Daniel Gultsch ffffca10f0 renamed colors 2015-07-13 12:55:13 +02:00
iNPUTmice 967cd922e1 highlight muc members by touching their name in muc details. fixed #503 2014-11-17 01:54:01 +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