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
..
assets	…
devise	…
generators	…
mastodon	…
paperclip	…
tasks	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
templates	…