Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.		2018-09-03 14:33:06 +02:00
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-03 14:33:06 +02:00
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
templates	…
cli.rb	Add CLI task for rotating keys (#8466)	2018-08-26 20:21:03 +02:00