Merge branch 'develop' into 'develop'
[akkoma] / priv / static / emoji /
2017-11-16 Roger BraunAdd mastodon emoji folder.
2017-09-16 Roger BraunMake emoji configurable in files.