Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
flavours	Add column title to “Favourited by” and “Boosted by” columns	2019-04-08 21:59:30 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01: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	2019-04-10 09:16:08 +02:00
packs	Hopefully fix input text selection quirks on iOS (#10463)	2019-04-03 17:54:54 +02: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	2019-04-10 09:16:08 +02:00