Merge branch 'release'

puniverse · Jul 18, 2016 · 0e88272 · 0e88272
2 parents d7f0fb1 + 24d2a6c
commit 0e88272
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1 +1,3 @@
 We are happy to receive contributions from the developer community to this free software project. If you make a non-trivial contribution and wish it merged into this project's main repository, you must first agree to and sign this [Contributor's Agreement](https://docs.google.com/a/paralleluniverse.co/forms/d/1U5GinUnRsYbvAP5W3-o11wmRkMmicD_WgRDS6Sy30HA/viewform). We appreciate your effort to making this free software better.
+
+If you create a new GitHub Pull Request, please base bugfix changes upon the `release` branch and any other change (improvements, features etc.) upon the `master` branch.
diff --git a/README.md b/README.md
@@ -58,6 +58,10 @@ Finally there are several regularly updated third-party bootstrap projects: [Com
 
 Questions and suggestions are welcome at this [forum/mailing list](https://groups.google.com/forum/#!forum/comsat-user).
 
+## Contributions (including Pull Requests)
+
+Please have a look at some brief [information for contributors](https://github.com/puniverse/comsat/blob/master/CONTRIBUTING.md).
+
 ## License
 
 COMSAT is free software published under the following license: