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
..
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	2019-10-02 20:04:46 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
workers	Merge tag 'v3.0.0' into glitch-soc/merge-upstream	2019-10-04 19:49:43 +02:00