Merge branch 'hotfix/media-proxy-uri' into 'develop'
[akkoma] / priv / static / finmoji / 128px / theoriginalsanta-128.png
2017-06-19 Roger BraunAdd finmoji.