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

Fix duplicate HTML ids in /about (#11803)

2019-09-10 20:55:23 +02:00

_registration.html.haml

Add ability to require invite request text (#15326)

2020-12-14 10:03:09 +01:00

more.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2020-12-15 14:27:06 +01:00

show.html.haml

Fix some account avatars on public pages having incorrect size (#13692)

2020-05-13 21:20:34 +02:00

terms.html.haml

Update /terms and /about/more to use public layout (#8142)

2018-08-09 12:58:20 +02:00