Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md: kept our version		2019-01-28 21:14:47 +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	Preload common JSON-LD contexts (#9412)	2018-12-02 16:46:13 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-28 21:14:47 +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	Add tootctl --version (#9835)	2019-01-17 21:32:55 +01:00