Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
assets	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
paperclip	…
tasks	…
templates	…
cli.rb	…