Merge branch 'master' of https://git.fairkom.net/chat/fairchat into android8Push

1 job for android8Push in 2 minutes and 32 seconds (queued for 3 seconds)
latest