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.

Sign up for GitHub

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

Jump to bottom

DOC Update contributing code page #358

Merged
merged 1 commit into from
Oct 13, 2023
Merged

DOC Update contributing code page #358

merged 1 commit into from
Oct 13, 2023

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented Oct 5, 2023 •
edited
Loading

@GuySartorelli GuySartorelli marked this pull request as draft October 5, 2023 04:14
@GuySartorelli GuySartorelli marked this pull request as ready for review October 6, 2023 01:35
GuySartorelli
GuySartorelli commented Oct 6, 2023
View reviewed changes
en/05_Contributing/01_Code.md Outdated Show resolved Hide resolved
en/05_Contributing/01_Code.md Show resolved Hide resolved
@GuySartorelli GuySartorelli mentioned this pull request Oct 6, 2023
Closed
emteknetnz
emteknetnz requested changes Oct 11, 2023
View reviewed changes
en/05_Contributing/01_Code.md Show resolved Hide resolved
en/05_Contributing/01_Code.md Outdated Show resolved Hide resolved
@GuySartorelli GuySartorelli force-pushed the pulls/4.13/contributing-docs2 branch 2 times, most recently from 230a80d to b1b5777 Compare October 12, 2023 20:44
@GuySartorelli
Copy link
Member Author

Rebased and resolved conflicts

emteknetnz
emteknetnz requested changes Oct 12, 2023
View reviewed changes
Copy link
Member

@emteknetnz emteknetnz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge conflict due to merging other PRs

@GuySartorelli
Copy link
Member Author

Lol of course.
Rebased and resolved conflicts.

@emteknetnz emteknetnz merged commit 871cce5 into silverstripe:4.13 Oct 13, 2023
@emteknetnz emteknetnz deleted the pulls/4.13/contributing-docs2 branch October 13, 2023 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emteknetnz emteknetnz emteknetnz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GuySartorelli @emteknetnz