Merge branch 'master' into installer-cygwin-support-3
Conflicts: tools/install.sh
plugins/emoji/README.md
0 → 100644
plugins/emoji/emoji-data.txt
0 → 100644
Please register or sign in to comment
Conflicts: tools/install.sh