Thibaut Girka 9dfbcf941e Merge branch 'master' into glitch-soc/merge-upstream		2019-01-20 16:49:23 +01:00
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	2018-09-01 03:35:37 +02:00
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	2018-09-17 21:09:59 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
templates	…
cli.rb	…