mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
|---|---|---|
| .. | ||
| credentials_controller.rb | ||
| featured_tags_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| identity_proofs_controller.rb | ||
| lists_controller.rb | ||
| notes_controller.rb | ||
| pins_controller.rb | ||
| relationships_controller.rb | ||
| search_controller.rb | ||
| statuses_controller.rb | ||