Thibaut Girka abcba5c198 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.		2019-12-07 12:28:59 +01:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
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-11-06 14:38:28 +01:00
paperclip	Update ESLint and RuboCop in Code Climate (#12534)	2019-12-02 18:25:43 +01: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