Merge branch 'master' into messageSearch
Showing
- CustomModels/models.cpp 78 additions, 0 deletionsCustomModels/models.cpp
- CustomModels/models.h 37 additions, 0 deletionsCustomModels/models.h
- engine.pro 2 additions, 0 deletionsengine.pro
- repos/channelrepository.cpp 6 additions, 7 deletionsrepos/channelrepository.cpp
- repos/channelrepository.h 4 additions, 4 deletionsrepos/channelrepository.h
- rocketchat.cpp 13 additions, 21 deletionsrocketchat.cpp
- rocketchat.h 1 addition, 10 deletionsrocketchat.h
- rocketchatserver.cpp 10 additions, 17 deletionsrocketchatserver.cpp
- rocketchatserver.h 7 additions, 14 deletionsrocketchatserver.h
- services/messageservice.cpp 1 addition, 2 deletionsservices/messageservice.cpp
- services/messageservice.h 2 additions, 1 deletionservices/messageservice.h
Loading
Please register or sign in to comment