Merge pull request #4941 from jjaffeux/emoji-ordering

Browse Source

Emoji ordering

...

This commit is contained in:

Sam 2017-06-23 12:00:16 -04:00 committed by GitHub

parent a682ef5266 7c68949e04

commit 6048ca2b7d

2 changed files with 1200 additions and 2568 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2189

app/assets/javascripts/discourse/lib/emoji/groups.js.es6

View File

File diff suppressed because it is too large Load Diff

1579

lib/tasks/emoji.rake

View File

File diff suppressed because it is too large Load Diff