Merge pull request #531 from TheElf/devel

Plural of Emoji
This commit is contained in:
Maxime Quandalle 2016-03-18 17:14:10 +01:00
commit e1d01e1652
18 changed files with 32 additions and 32 deletions

2
client/lib/keyboard.js Normal file → Executable file
View file

@ -88,7 +88,7 @@ Template.keyboardShortcuts.helpers({
action: 'shortcut-autocomplete-members',
}, {
keys: [':'],
action: 'shortcut-autocomplete-emojies',
action: 'shortcut-autocomplete-emoji',
}, {
keys: ['SPACE'],
action: 'shortcut-assign-self',