ilot/ilot-io
2
0
Fork 1
Code Issues 8 Pull requests 3 Projects Releases Packages Wiki Activity Actions

tools: rework platforms to talk about tools #18

Open
ayakael wants to merge 4 commits from tools-page into main
pull from: tools-page
merge into: ilot:main
Conversation 1 Commits 4 Files changed 18 +18 -297
ayakael commented 2024-10-09 23:53:18 +00:00
Owner
Copy link
No description provided.
ayakael added 4 commits 2024-10-09 23:53:19 +00:00
images/logo*: add nextcloud tools logos
All checks were successful
/ preview (pull_request) Successful in 37s
Details
6e067ee884
ayakael commented 2024-10-10 12:55:54 +00:00
Author
Owner
Copy link

We can model off of https://disroot.org/en/#services

We can model off of https://disroot.org/en/#services
ayakael added this to the Enhancements project 2024-10-10 12:56:16 +00:00
All checks were successful
/ preview (pull_request) Successful in 37s
Details
This pull request has changes conflicting with the target branch.
  • platforms.fr.mo
  • platforms.fr.po
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin tools-page:tools-page
git checkout tools-page

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff tools-page
git checkout tools-page
git rebase main
git checkout main
git merge --ff-only tools-page
git checkout tools-page
git rebase main
git checkout main
git merge --no-ff tools-page
git checkout main
git merge --squash tools-page
git checkout main
git merge --ff-only tools-page
git checkout main
git merge tools-page
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Enhancements
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: ilot/ilot-io#18
No description provided.
Delete branch "tools-page"

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?