Daniel Gultsch 4a1a59f0c8 Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps		2016-02-02 18:19:26 +01:00
..
DatabaseBackend.java	Persisitence and loading for ServiceDiscoveryResult	2016-01-23 10:53:56 -05:00
FileBackend.java	changed FileBackend API to allow files instead of messages to be copied and resized	2016-01-24 12:17:00 +01:00
OnPhoneContactsMerged.java	Make conversations the root project	2014-10-22 15:47:11 -04:00