diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
| commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
| tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /api | |
| parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
| parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
| download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'api')
| -rw-r--r-- | api/api_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/api_test.go b/api/api_test.go index bea949ad2..2ef4e196d 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -19,6 +19,8 @@ func Setup() { StartServer() InitApi() Client = model.NewClient("http://localhost" + utils.Cfg.ServiceSettings.ListenAddress) + + Srv.Store.MarkSystemRanUnitTests() } } |