repos/entities/rocketchatchannel.cpp · f47163df506504e50bb1ea9a920c34800c143147 · chat / RocketChatMobileEngine · GitLab

Find file Blame History Permalink

Merge branch 'master' into 'mutexProb' · 053bd164
armin authored Feb 09, 2019
```
# Conflicts:
#   CustomModels/channelmodel.cpp
#   container/sortedvector.cpp
```
053bd164

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net