Thibaut Girka bca3825c17 Merge branch 'master' into glitch-soc/merge-upstream		2019-07-28 16:28:05 +02:00
..
assets
devise
generators
json_ld	Bump json-ld-preloaded from 3.0.2 to 3.0.3 (#11316)	2019-07-28 13:48:43 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02:00
paperclip	Fix converted media being saved with original extension and mime type (#11130)	2019-06-20 10:52:36 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
templates
cli.rb	Add tootctl preview_cards remove (#11320)	2019-07-28 13:48:19 +02:00