Samuel Hand f3c82094cd Merge branch 'master' into omemo-trust-ui		2018-07-07 12:12:31 +01:00
..
data	Add a toggle switch for key management	2018-07-04 21:26:14 +01:00
po	Update translations	2018-07-05 09:22:44 -06:00
src	More database migration, update defaults and indexes	2018-07-06 20:14:51 +01:00
CMakeLists.txt	Add trust management utilities to the omemo plugin	2018-06-11 07:11:22 +01:00