Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +02:00
..
rules	Fix build with new sass-loader	2019-11-07 14:56:09 +01:00
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
development.js	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
generateLocalePacks.js
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' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
tests.js	Revert CircleCI and some webpack changes to match upstream	2019-11-20 18:05:24 +01:00
translationRunner.js