Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BullHorn 2015-05-16 21:56:10 +03:00
commit 886a82293d

View File

@ -1,6 +1,6 @@
---
layout: wiki
title: Merging Pull Requests
title: Branching and Release
description:
group: development
parent: wiki
@ -34,4 +34,4 @@ During this release process between the Friday and Tuesday, the day of release,
### 2.2 Diagram
<img src="{{ site.baseurl }}/img/wiki/development/release_and_branching.jpg" alt="Release and branching flowchart" />
<a href="{{ site.baseurl }}/img/wiki/development/release_and_branching.jpg"><img src="{{ site.baseurl }}/img/wiki/development/release_and_branching.jpg" alt="Release and branching flowchart" /></a>