mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-15 20:54:01 -05:00
65e994b29b
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours. |
||
|---|---|---|
| .. | ||
| 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 | ||
| link_header.js | ||
| load_polyfills.js | ||
| main.js | ||
| performance.js | ||
| ready.js | ||
| rtl.js | ||
| scroll.js | ||
| settings.js | ||
| stream.js | ||
| test_setup.js | ||
| uuid.js | ||