Thibaut Girka 5e6cec4a40 Import upstream's emojify function in settings.js ... This fixes updating the profile preview when changing display name.		2018-08-05 12:57:20 +02:00
..
core	Import upstream's emojify function in settings.js	2018-08-05 12:57:20 +02:00
flavours	Fix styling of toot prepended text on public profiles	2018-08-02 12:43:00 +02:00
fonts
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 00:18:13 +02:00