diff options
| author | George Goldberg <george@gberg.me> | 2018-05-10 12:03:51 +0100 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-05-10 12:03:51 +0100 |
| commit | 11c60ea41afd419036edc54b5571f26ce680c93c (patch) | |
| tree | fefb6b2336a886500f910008433a0806dfdef888 /app | |
| parent | d3e14a1bf86ac6148e09f888384cb46c61f23cdc (diff) | |
| parent | db6b8f6238853c6e7e48dc8015a0b25f97ee232a (diff) | |
| download | chat-11c60ea41afd419036edc54b5571f26ce680c93c.tar.gz chat-11c60ea41afd419036edc54b5571f26ce680c93c.tar.bz2 chat-11c60ea41afd419036edc54b5571f26ce680c93c.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'app')
| -rw-r--r-- | app/emoji.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/emoji.go b/app/emoji.go index f48501cf9..2f957fbcc 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -23,7 +23,7 @@ import ( ) const ( - MaxEmojiFileSize = 1000 * 1024 // 1 MB + MaxEmojiFileSize = 1 << 20 // 1 MB MaxEmojiWidth = 128 MaxEmojiHeight = 128 ) |