mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-13 19:54:01 -05:00
4df3b7cb06
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. |
||
---|---|---|
.. | ||
actions | ||
components | ||
containers | ||
features | ||
locales | ||
middleware | ||
reducers | ||
selectors | ||
service_worker | ||
storage | ||
store | ||
utils | ||
api.js | ||
base_polyfills.js | ||
common.js | ||
compare_id.js | ||
extra_polyfills.js | ||
initial_state.js | ||
is_mobile.js | ||
load_polyfills.js | ||
main.js | ||
performance.js | ||
ready.js | ||
rtl.js | ||
scroll.js | ||
settings.js | ||
stream.js | ||
test_setup.js | ||
uuid.js |