Skip to content

Update from upstream #171

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

Merged
merged 308 commits into from
Oct 28, 2019
Merged

Update from upstream #171

merged 308 commits into from
Oct 28, 2019

Conversation

mr-c
Copy link
Member

@mr-c mr-c commented Oct 28, 2019

No description provided.

rgaiacs and others added 30 commits March 22, 2018 19:13
As @marwahaha said

> "master repository" feels overloaded,
> since typically "master" refers to a branch name.

We are going to use "originating repository".
Update repo_check.py with new GitHub labels
Updating to handbook as canonical source for CoC
Some commits from (lesson-example/186) Assorted minor fixes to spelling, whitespace, hyperlinks & sorting
links.md: remove duplicate line
bin/util.py: fix error handling for Python 2
convert to py3.4 syntax, a few cleanups
Close swcarpentry/lesson-example/193
raynamharris and others added 20 commits May 16, 2019 12:58
Pull Request: carpentries/styles#406

* change all-in-one file to have the same 'depth' as episode files

* move the core script of aio.md into _includes/aio-script.md

* include comment to inform maintainers to not edit the file

* move aio.md to the root of styles repository
Co-authored-by: stamper <tbyhdgs@gmail.com>
@mr-c mr-c requested a review from tobyhodges October 28, 2019 15:30
tobyhodges
tobyhodges previously approved these changes Oct 28, 2019
@tobyhodges tobyhodges merged commit 1dc24a6 into gh-pages Oct 28, 2019
@tobyhodges tobyhodges deleted the update_from_upstream branch October 28, 2019 16:34
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.