CatCatNya/catstodon
4
2
Fork 0
forked from glitch-soc-github-mirror/mastodon
Code Issues 12 Pull requests 1 Projects 1 Releases 21 Wiki Activity

Catstodon branding changes #21

Open
Jeremy Kescher wants to merge 2 commits from feature/catstodon-branding into main
pull from: feature/catstodon-branding
merge into: CatCatNya:main
Conversation 0 Commits 2 Files changed 2 +30 -3
Jeremy Kescher commented 2025-07-04 17:07:23 +00:00
Owner
Copy link
  • Add disclaimer to README.md
  • Switch out all logos and wordmarks
  • Change all illustrations (may become separate PR, as an artist has yet to be commissioned)
- [x] Add disclaimer to README.md - [ ] Switch out all logos and wordmarks - [ ] Change all illustrations (may become separate PR, as an artist has yet to be commissioned)
Jeremy Kescher added 1 commit 2025-07-04 17:07:23 +00:00
Jeremy Kescher added 1 commit 2025-07-04 17:16:09 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/catstodon-branding:feature/catstodon-branding
git checkout feature/catstodon-branding

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff feature/catstodon-branding
git checkout feature/catstodon-branding
git rebase main
git checkout main
git merge --ff-only feature/catstodon-branding
git checkout feature/catstodon-branding
git rebase main
git checkout main
git merge --no-ff feature/catstodon-branding
git checkout main
git merge --squash feature/catstodon-branding
git checkout main
git merge --ff-only feature/catstodon-branding
git checkout main
git merge feature/catstodon-branding
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: CatCatNya/catstodon#21
No description provided.
Delete branch "feature/catstodon-branding"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?