tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/domain_blocks
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
new.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
show.html.haml Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00