Skip to content
This repository has been archived by the owner on Jun 24, 2020. It is now read-only.

Update boilerplate #3

Merged
merged 20 commits into from
Mar 6, 2017
Merged

Update boilerplate #3

merged 20 commits into from
Mar 6, 2017

Conversation

euank
Copy link
Contributor

@euank euank commented Mar 6, 2017

This adds our 3rd source commit by doing a merge --allow-unrelated of the template project. Hopefully whatever git tooling you use is okay with that 😄

This also updates the readme with an appropriate warning.

cc @crawford

I think with the readme update, this is okay to flip to public.

Brandon Philips and others added 20 commits January 19, 2014 12:25
fix(CONTRIBUTING.md): Fix title case
Clean up CONTRIBUTING.md and other bits of template-project
After talking to a few people on the team we have decided that the
feat/fix/etc tags aren't adding much value. Use a simpler format
instead.
Setup some expectation for etiquette.
CONTRIBUTING: add reference to golang style guide
And a code of conduct based on the well adopted Contributor Covenant
which is used in other large projects that CoreOS depends on such as
AngularJS, Kubernetes, Jekyll, curl, and many many more.

Also add the events code of conduct to cover any meetups, conferences,
or other social events based on the existing CoreOS Fest code of
conduct: https://coreos.com/fest/conduct/
NOTICE: Bump copyright year
Use default boilerplate
@euank euank merged commit 62c1326 into coreos:master Mar 6, 2017
@euank euank deleted the update-boilerplate branch March 6, 2017 22:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants