diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
| commit | 6d6cada0970a2b341f36dac9b0fed8262ada1865 (patch) | |
| tree | fc3728f15deaebd0c870838a63735659a33456e7 /model/channel.go | |
| parent | 0b986ed3147c885af6b2f33e1ff3eb6754e8f274 (diff) | |
| parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
| download | chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.gz chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.bz2 chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'model/channel.go')
| -rw-r--r-- | model/channel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/model/channel.go b/model/channel.go index 0ce09f4bc..7109500d4 100644 --- a/model/channel.go +++ b/model/channel.go @@ -57,8 +57,8 @@ func (o *Channel) Etag() string { return Etag(o.Id, o.UpdateAt) } -func (o *Channel) ExtraEtag() string { - return Etag(o.Id, o.ExtraUpdateAt) +func (o *Channel) ExtraEtag(memberLimit int) string { + return Etag(o.Id, o.ExtraUpdateAt, memberLimit) } func (o *Channel) IsValid() *AppError { |