Thibaut Girka 0ae7d84273 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`

2019-11-06 14:38:28 +01:00

..

assets

…

chewy/strategy

Fix records not being indexed sometimes (#12024)

2019-10-01 01:19:11 +02:00

devise

Fix authentication before 2FA challenge (#11943)

2019-09-24 04:35:36 +02:00

generators

…

json_ld

Fix preloaded JSON-LD context for identity not being used (#12138)

2019-10-10 06:48:53 +02:00

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-06 14:38:28 +01:00

paperclip

Fix performance of GIF re-encoding (#12057)

2019-10-03 01:09:12 +02:00

tasks

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

templates

…

cli.rb

Add tootctl preview_cards remove (#11320)

2019-07-28 13:48:19 +02:00