Baptiste Lemoine b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon ...

Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

# Conflicts:
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/features/status/components/action_bar.js

2020-02-12 10:03:28 +01:00

..

about.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

admin.js

Admin setting to disable default follows (#12566)

2019-12-16 23:55:50 +01:00

application.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

error.js

Change error graphic to hover-to-play (#10055)

2019-02-15 23:33:25 +01:00

mailer.js

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

public.js

Merge branch 'master' of https://github.com/tootsuite/mastodon

2020-02-12 10:03:28 +01:00

share.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00