Thibaut Girka 654fd69903 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.		2020-07-15 15:32:40 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
flavours	[Glitch] Fix block/mute pagination in WebUI	2020-07-10 18:49:33 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
packs	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00