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	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-28 21:14:47 +01:00
paperclip
tasks
templates
cli.rb