summaryrefslogtreecommitdiffstats
path: root/client/lib/keyboard.js
diff options
context:
space:
mode:
authorMaxime Quandalle <maxime@quandalle.com>2016-03-18 17:14:10 +0100
committerMaxime Quandalle <maxime@quandalle.com>2016-03-18 17:14:10 +0100
commite1d01e1652ff5fed866216a602a68086de229c74 (patch)
tree5c0476ab10f46b764631d376ecf5ea32df16e2c2 /client/lib/keyboard.js
parent90601eacae616c3bca46d6dcb643aa94b1fd05c6 (diff)
parentc05029d40312bdc57d99be1d792a1d592c17d029 (diff)
downloadwekan-e1d01e1652ff5fed866216a602a68086de229c74.tar.gz
wekan-e1d01e1652ff5fed866216a602a68086de229c74.tar.bz2
wekan-e1d01e1652ff5fed866216a602a68086de229c74.zip
Merge pull request #531 from TheElf/devel
Plural of Emoji
Diffstat (limited to 'client/lib/keyboard.js')
-rwxr-xr-x[-rw-r--r--]client/lib/keyboard.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js
index f8212c9b..ff18738b 100644..100755
--- a/client/lib/keyboard.js
+++ b/client/lib/keyboard.js
@@ -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',