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
..
migrate	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
post_migrate	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
schema.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00