Daniel Gultsch 5363470bcf fix getNextEncryption		2018-03-19 10:08:36 +01:00
..
java/eu/siacs/conversations	fix getNextEncryption	2018-03-19 10:08:36 +01:00
res	fixed some regressions introduced in toolbar migration	2018-03-18 09:31:37 +01:00
AndroidManifest.xml	Merge branch 'master' of github.com:siacs/Conversations	2018-03-14 08:22:18 +01:00