diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-01 14:44:17 -0800 |
| commit | b4ec6900510077253290e361d1a706e5368a45de (patch) | |
| tree | 6fc7c131fa7aa5f32e3aba8102416aa23c65963d /api/context.go | |
| parent | ea71731f838fc010cfc7511c09875184d1b2396b (diff) | |
| parent | f28486c4553f7f4bccf7bf69153c2f12699705f9 (diff) | |
| download | chat-b4ec6900510077253290e361d1a706e5368a45de.tar.gz chat-b4ec6900510077253290e361d1a706e5368a45de.tar.bz2 chat-b4ec6900510077253290e361d1a706e5368a45de.zip | |
Fixing merge
Diffstat (limited to 'api/context.go')
| -rw-r--r-- | api/context.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/context.go b/api/context.go index 41a52fa0c..b91981ecd 100644 --- a/api/context.go +++ b/api/context.go @@ -45,6 +45,7 @@ type Page struct { User *model.User Team *model.Team Channel *model.Channel + Preferences *model.Preferences PostID string SessionTokenIndex int64 Locale string |