mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
9abb227250
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes. |
||
|---|---|---|
| .. | ||
| emoji | ||
| api.js | ||
| async-components.js | ||
| backend_links.js | ||
| base64.js | ||
| base_polyfills.js | ||
| compare_id.js | ||
| content_warning.js | ||
| counter.js | ||
| dom_helpers.js | ||
| extra_polyfills.js | ||
| fullscreen.js | ||
| get_rect_from_entry.js | ||
| hashtag.js | ||
| html.js | ||
| idna.js | ||
| initial_state.js | ||
| intersection_observer_wrapper.js | ||
| is_mobile.js | ||
| js_helpers.js | ||
| load_keyboard_extensions.js | ||
| load_polyfills.js | ||
| log_out.js | ||
| main.js | ||
| numbers.js | ||
| optional_motion.js | ||
| performance.js | ||
| privacy_preference.js | ||
| react_helpers.js | ||
| react_router_helpers.js | ||
| ready.js | ||
| reduced_motion.js | ||
| redux_helpers.js | ||
| resize_image.js | ||
| rtl.js | ||
| schedule_idle_task.js | ||
| scroll.js | ||
| scrollbar.js | ||
| settings.js | ||
| stream.js | ||
| url_regex.js | ||
| uuid.js | ||