gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-02-19 15:38:31 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
d42e7e01dc
mastodon/app/views/admin/settings
History
Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
2020-12-19 00:55:12 +01:00
..
edit.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00