djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
9213b02656
tootlab-mastodon/app/views/about
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
..
_domain_blocks.html.haml Add option to obfuscate domain name in public list of domain blocks (#15355) 2020-12-18 08:30:41 +01:00
_login.html.haml
_registration.html.haml
more.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
show.html.haml
terms.html.haml