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	…
generators	…
json_ld	…
mastodon	…
paperclip	…
tasks	…
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	…