diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2016-03-18 17:14:10 +0100 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2016-03-18 17:14:10 +0100 |
| commit | e1d01e1652ff5fed866216a602a68086de229c74 (patch) | |
| tree | 5c0476ab10f46b764631d376ecf5ea32df16e2c2 /CHANGELOG.md | |
| parent | 90601eacae616c3bca46d6dcb643aa94b1fd05c6 (diff) | |
| parent | c05029d40312bdc57d99be1d792a1d592c17d029 (diff) | |
| download | wekan-e1d01e1652ff5fed866216a602a68086de229c74.tar.gz wekan-e1d01e1652ff5fed866216a602a68086de229c74.tar.bz2 wekan-e1d01e1652ff5fed866216a602a68086de229c74.zip | |
Merge pull request #531 from TheElf/devel
Plural of Emoji
Diffstat (limited to 'CHANGELOG.md')
| -rwxr-xr-x[-rw-r--r--] | CHANGELOG.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0714a5f4..629b7fee 100644..100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,8 +98,8 @@ the popover was new). New features includes: * Assign and unassign members to cards; * Archive cards (though restoration is not yet possible); * Board stars; -* Markdown and emojies support in comments and card description; -* Emojies auto-completion in the text editor; +* Markdown and emoji support in comments and card description; +* Emoji auto-completion in the text editor; * Some keyboard shortcuts (eg `Ctrl`+`Enter` to submit a multi-line input). We also introduced basic support for the [Sandstorm](https://sandstorm.io) |