diff options
author | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
---|---|---|
committer | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
commit | 18fa32567b56584c6e24da2ae68814d5bf8ece6f (patch) | |
tree | 311ab6a3918ba64ac665286f15950b32dc1b1dba /store/sqlstore/compliance_store.go | |
parent | 7b2861de3a09cf00d00b0872cc537d54302c4bfa (diff) | |
parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
download | chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.gz chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.bz2 chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.zip |
Merge branch 'release-4.7' into XYZ-110
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 |