iNPUTmice c02ef80086 Merge branch 'master' of github.com:siacs/Conversations ... Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java		2014-09-09 14:16:51 +02:00
..
crypto	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
entities	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
generator	fixed sending offline pgp messages	2014-09-08 14:08:59 +02:00
parser	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
persistance	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
services	don't reset images from sending to waiting	2014-09-09 13:56:30 +02:00
ui	Merge branch 'master' of github.com:siacs/Conversations	2014-09-09 14:16:51 +02:00
utils	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
xml	fixed #403	2014-09-01 14:03:21 +02:00
xmpp	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00
Config.java	setting to increase font size. fixed #420	2014-09-08 23:58:37 +02:00