Changes in workflow due to k.sfconservancy.org.

This commit is contained in:
Bradley M. Kuhn 2016-07-19 16:39:33 -07:00
parent d88ddcd19c
commit 258e82f4e1

View file

@ -27,11 +27,11 @@ other Conservancy enthusiasts on
The 'master' branch in this repository denotes the current polices that are The 'master' branch in this repository denotes the current polices that are
in-effect for the Software Freedom Conservancy, Inc. Proposals are made by in-effect for the Software Freedom Conservancy, Inc. Proposals are made by
people in forked versions on Gitorious, and then if the people in
[Conservancy staff](https://sfconservancy.org/about/staff/) plans to propose [pull requests on k.sfconservancy.org](https://k.sfconservancy.org/policies/pull-request),
them to and then if the [Conservancy staff](https://sfconservancy.org/about/staff/)
plans to propose them to
[Conservancy's Board of Directors](https://sfconservancy.org/about/board/), [Conservancy's Board of Directors](https://sfconservancy.org/about/board/),
they are merged into the 'ready-for-board-approval' branch. Once approved by they are merged into the 'ready-for-board-approval' branch. Once approved by
the Board of Directors, Conservancy staff merges the changes into the the Board of Directors, Conservancy staff merges the changes into the
'master' branch. 'master' branch.