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.rake

…

auto_annotate_models.rake

…

db.rake

…

emojis.rake

…

glitchsoc.rake

…

mastodon.rake

Get rid of all batch order warnings (#8334)

2018-08-21 12:25:50 +02:00

statistics.rake

…