diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 18:36:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 18:36:39 -0600 |
| commit | fbef16f8630f74248157c2cd9e546ece355c869a (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /store/sqlstore/compliance_store.go | |
| parent | 56f49cf4860cfca51e852ec3e7d9df772d2b2060 (diff) | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| download | chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.gz chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.bz2 chat-fbef16f8630f74248157c2cd9e546ece355c869a.zip | |
Merge branch 'release-4.7' into rm-willnorris-proxy-support
Diffstat (limited to 'store/sqlstore/compliance_store.go')
| -rw-r--r-- | store/sqlstore/compliance_store.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/store/sqlstore/compliance_store.go b/store/sqlstore/compliance_store.go index 03d92d5e1..a25b01548 100644 --- a/store/sqlstore/compliance_store.go +++ b/store/sqlstore/compliance_store.go @@ -225,8 +225,7 @@ func (s SqlComplianceStore) MessageExport(after int64, limit int) store.StoreCha Channels.Id AS ChannelId, Channels.DisplayName AS ChannelDisplayName, Users.Id AS UserId, - Users.Email AS UserEmail, - Users.Username + Users.Email AS UserEmail FROM Posts LEFT OUTER JOIN Channels ON Posts.ChannelId = Channels.Id |