Thibaut Girka 3922b518f7 Merge branch 'master' into glitch-soc/merge-upstream

2019-06-28 21:36:50 +02:00

..

assets

…

devise

…

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-06-28 21:36:50 +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

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +02:00