mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
f9d000ebae
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version. |
||
---|---|---|
.. | ||
edit.html.haml | ||
new.html.haml | ||
show.html.haml |