Daniel Gultsch aa21797f43 Merge branch 'master' of github.com:siacs/Conversations		2015-12-02 16:38:33 +01:00
..
java/eu/siacs/conversations	Merge branch 'master' of github.com:siacs/Conversations	2015-12-02 16:38:33 +01:00
res	Merge pull request #1545 from SamWhited/show_new_contact_request_messages	2015-12-02 16:38:08 +01:00
AndroidManifest.xml	users are now able to crop their avatar pictures using the android-crop	2015-12-02 14:25:20 +01:00