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

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

devise

Add ldap search filter (#8151)

2018-08-15 18:12:44 +02:00

generators

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

mastodon

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

2018-08-01 00:18:13 +02:00

paperclip

Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream

2018-07-30 14:39:06 +02:00

tasks

Merge branch 'master' into glitch-soc/master

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

templates

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00