mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 02:09:05 +09:00
90528f43bc
Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream. |
||
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller.rb | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| identity_proofs_controller.rb | ||
| imports_controller.rb | ||
| migrations_controller.rb | ||
| pictures_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentication_methods_controller.rb | ||