Merge changes from #4241 into installer-portable-colors
Conflicts: tools/install.sh tools/upgrade.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 tools/upgrade.sh