iNPUTmice c62937016b rotate avatars ... Conflicts: src/eu/siacs/conversations/persistance/FileBackend.java		2014-09-02 11:31:39 +02:00
..
DatabaseBackend.java	fixed faulty db creation on first install	2014-08-24 20:53:13 +02:00
FileBackend.java	rotate avatars	2014-09-02 11:31:39 +02:00
OnPhoneContactsMerged.java	rebranding	2014-02-28 18:46:01 +01:00