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
..
rules	Update Tesseract.js (#14708)	2020-09-01 00:26:10 +02:00
configuration.js	builds for dev	2019-12-13 16:52:41 +01:00
development.js	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
environment.js	builds for dev	2019-12-13 16:52:41 +01:00
generateLocalePacks.js	builds for dev	2019-12-13 16:52:41 +01:00
production.js	Bump imports-loader from 0.8.0 to 1.1.0 (#14323)	2020-08-25 22:50:47 +09:00
shared.js	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-09-21 14:36:15 +02:00
tests.js	builds for dev	2019-12-13 16:52:41 +01:00
translationRunner.js	builds for dev	2019-12-13 16:52:41 +01:00