Samuel Hand f3c82094cd Merge branch 'master' into omemo-trust-ui		2018-07-07 12:12:31 +01:00
..
data	Update translations	2018-07-05 09:22:44 -06:00
po	Update translations	2018-07-05 09:22:44 -06:00
src	More cleanup and database modifications	2018-06-26 15:42:02 +01:00
CMakeLists.txt	Redesign chat input + move file upload there	2018-04-30 11:03:59 +02:00