Baptiste Lemoine aff743695a Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/account/components/header.js # config/webpack/production.js # db/schema.rb # yarn.lock		2020-09-21 14:36:15 +02:00
..
assets	prototype for groups	2019-08-27 17:05:17 +02:00
chewy	Change `tootctl search deploy` algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
helpers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
javascript	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
lib	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
mailers	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
models	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
policies	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
presenters	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
serializers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
services	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
validators	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
views	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
workers	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00