Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

model/channel.go

@@ -134,17 +134,12 @@ func (o *Channel) PreSave() {
 
 	o.CreateAt = GetMillis()
 	o.UpdateAt = o.CreateAt
-	o.ExtraUpdateAt = o.CreateAt
 }
 
 func (o *Channel) PreUpdate() {
 	o.UpdateAt = GetMillis()
 }
 
-func (o *Channel) ExtraUpdated() {
-	o.ExtraUpdateAt = GetMillis()
-}
-
 func (o *Channel) IsGroupOrDirect() bool {
 	return o.Type == CHANNEL_DIRECT || o.Type == CHANNEL_GROUP
 }