Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master ...

Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.

2018-08-21 18:24:48 +02:00

..

core

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-18 18:04:49 +02:00

flavours

[Glitch] Add hotkey for follow requests

2018-08-20 21:25:02 +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/master

2018-08-21 18:24:48 +02:00

packs

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-18 18:04:49 +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/master

2018-08-21 18:24:48 +02:00