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

Merge upstream changes #8

Merged
merged 0 commits into from
Mar 26, 2024
Merged

Merge upstream changes #8

merged 0 commits into from
Mar 26, 2024

Conversation

ns-rse
Copy link

@ns-rse ns-rse commented Mar 26, 2024

Pulling in up-stream changes which adds support for Citation File Formats in the footer.

@ns-rse ns-rse requested a review from Robadob March 26, 2024 13:44
Copy link
Member

@Robadob Robadob left a comment

Choose a reason for hiding this comment

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

Guess we're merging from upstream now

@ns-rse
Copy link
Author

ns-rse commented Mar 26, 2024

I was about to go through the README.md and address #7 and noticed we we're behind so had a look at what had changed. Figured that pulling from upstream would help with #6 so thought it worth comiting to updating/tracking changes from upstream regularly as I found out yesterday at the UK Carpentries monthly meetup about a PR to incorporate mermaid diagrams and as I've used quite a few of these in my material I'm keen to use that as soon as its available.

I'll solve the conflicts.

@Robadob
Copy link
Member

Robadob commented Mar 26, 2024

I thought I rebased last week (and just forced pushed to main), but maybe I didn't fetch upstream first.

@ns-rse ns-rse merged commit a7e7e56 into RSE-Sheffield:main Mar 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants