Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		2019-02-01 16:12:20 +01:00
..
chewy	Get rid of Chewy order/limit warning (#8355)	2018-08-22 02:44:56 +02:00
controllers	Make storing and displaying application used to toot opt-in	2019-01-27 13:56:41 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00
lib	Make storing and displaying application used to toot opt-in	2019-01-27 13:56:41 +01:00
mailers	Improve e-mail digest (#9689)	2019-01-02 10:47:32 +01:00
models	Make storing and displaying application used to toot opt-in	2019-01-27 13:56:41 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
serializers	Revert to storing application info, and display it to the author via API	2019-01-27 13:56:41 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-27 13:57:25 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
views	Make storing and displaying application used to toot opt-in	2019-01-27 13:56:41 +01:00
workers	Fix multiple workers for the same scheduled status being queueable (#9875)	2019-01-20 12:57:05 +01:00