Commit graph

5 commits

Author SHA1 Message Date
iNPUTmice 047aaf5d4f check if socket was null before doing ssl connect 2014-11-08 20:52:02 +01:00
iNPUTmice 2253814519 fixed notifications for images 2014-11-05 21:37:40 +01:00
iNPUTmice ff10b094a0 clear avatar cache after nick name change 2014-11-04 18:27:20 +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/java/eu/siacs/conversations/parser/MessageParser.java (Browse further)