mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-01 04:29:03 +01:00
c118918520
Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes. |
||
---|---|---|
.. | ||
credentials_controller.rb | ||
familiar_followers_controller.rb | ||
featured_tags_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
identity_proofs_controller.rb | ||
lists_controller.rb | ||
lookup_controller.rb | ||
notes_controller.rb | ||
pins_controller.rb | ||
relationships_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb |