Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
flavours	Fix mention links in detailed statuses not opening in the WebUI	2018-12-06 15:31:21 +01:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
packs	Escape HTML in profile name preview in profile settings (#9446)	2018-12-07 16:42:22 +01:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00