matteo/malcontent
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

WIP: add DNS parental controls (Rust version) #2

Draft
matteo wants to merge 2 commits from feature/dns-nss-parental-controls-rust into main
pull from: feature/dns-nss-parental-controls-rust
merge into: matteo:main
Conversation 0 Commits 2 Files changed 27 +4128 -1
matteo commented 2024-01-05 18:13:05 +01:00
Owner
Copy link
No description provided.
matteo force-pushed feature/dns-nss-parental-controls-rust from 8a31e15445 to 2169341cdf 2024-01-06 23:05:17 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls-rust from 2169341cdf to 78c7803d4a 2024-01-06 23:06:54 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls-rust from 78c7803d4a to 059042df4e 2024-01-09 09:24:34 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls-rust from 059042df4e to 03fbdb2d26 2024-01-09 09:25:01 +01:00 Compare
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/dns-nss-parental-controls-rust:feature/dns-nss-parental-controls-rust
git switch feature/dns-nss-parental-controls-rust

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 switch main
git merge --no-ff feature/dns-nss-parental-controls-rust
git switch feature/dns-nss-parental-controls-rust
git rebase main
git switch main
git merge --ff-only feature/dns-nss-parental-controls-rust
git switch feature/dns-nss-parental-controls-rust
git rebase main
git switch main
git merge --no-ff feature/dns-nss-parental-controls-rust
git switch main
git merge --squash feature/dns-nss-parental-controls-rust
git switch main
git merge --ff-only feature/dns-nss-parental-controls-rust
git switch main
git merge feature/dns-nss-parental-controls-rust
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
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
matteo/malcontent!2
No description provided.