mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
chewy | ||
controllers | ||
helpers | ||
javascript | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
serializers | ||
services | ||
validators | ||
views | ||
workers |