Merge Contributing into .github & Update License

joshbeckman · Oct 14, 2016 · 766c5ac · 766c5ac
1 parent 10747a4
commit 766c5ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -1,5 +1,10 @@
 # Contributing
 
+
+This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
+
+[code-of-conduct]: http://todogroup.org/opencodeofconduct/#Hub/opensource@github.com
+
 ## How to contribute
 
 Support and contributions from the open source community are essential for keeping

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Josh
+Copyright (c) 2016 - 2017 Josh & Green Pioneer Solutions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal