Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change. |
||
---|---|---|
.. | ||
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_keyboard_extensions.js | ||
load_polyfills.js | ||
main.js | ||
performance.js | ||
ready.js | ||
rtl.js | ||
scroll.js | ||
settings.js | ||
stream.js | ||
test_setup.js | ||
uuid.js |