Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tor page, fixes #1284 #1366

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update tor page, fixes #1284 #1366

wants to merge 3 commits into from

Conversation

andypiper
Copy link
Sponsor Member

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@andypiper andypiper requested review from vmstan and a team December 11, 2023 12:33
@andypiper andypiper self-assigned this Dec 11, 2023
Copy link

vercel bot commented Dec 11, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
documentation ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 11, 2023 5:40pm

@vmstan
Copy link
Contributor

vmstan commented Dec 11, 2023

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@andypiper
Copy link
Sponsor Member Author

Acknowledging the comments here, and pulled in the updates from the other issues / PRs to avoid another rebase and merge. Thank you @maxolasersquad @Le1b1

@andypiper
Copy link
Sponsor Member Author

Ah - I should also add the rest of the updates from #937 for completeness.

@vmstan
Copy link
Contributor

vmstan commented Dec 11, 2023

Ah - I should also add the rest of the updates from #937 for completeness.

Agreed

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@vmstan
Copy link
Contributor

vmstan commented Dec 11, 2023

LGTM

@andypiper andypiper added the admin Managing a Mastodon instance label Dec 11, 2023
@n0toose
Copy link
Contributor

n0toose commented Dec 14, 2023

I fixed the merge conflict from before in my own PR, sorry for the delay - if all of the changes get included in a single commit, I would like to politely ask for attribution using the Co-authored-by: trailer.

Thanks!

Copy link

This pull request has merge conflicts that must be resolved before it can be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
admin Managing a Mastodon instance rebase needed 🚧
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants