Samuel Hand ed3b36d0de Merge branch 'master' into omemo-muc		2018-08-04 23:37:55 +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	Merge branch 'master' into omemo-muc	2018-08-04 23:37:55 +01:00
CMakeLists.txt	Redesign chat input + move file upload there	2018-04-30 11:03:59 +02:00