This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		2019-10-10 17:26:08 +02: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	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
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-10-10 17:26:08 +02: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	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Add `tootctl preview_cards remove` (#11320)	2019-07-28 13:48:19 +02:00