tag:github.com,2008:https://github.com/cococay/docs/releasesTags from docs2016-06-22T06:39:08Ztag:github.com,2008:Repository/67170808/16-062016-06-22T06:39:08Z16-06: Merge branch 'dev' of github.com:openaps/docs into dev<p>Merge branch 'dev' of github.com:openaps/docs into dev</p>
<p>Merge further conflicts between master and dev.</p>bewesttag:github.com,2008:Repository/67170808/16-06-162016-06-16T18:45:43Z16-06-16scottleibrandtag:github.com,2008:Repository/67170808/16-052016-05-27T07:00:50Z16-05: Merge master to dev (#199)<p>Merge master to dev (<a class="issue-link js-issue-link" href="https://github.com/openaps/docs/pull/199">openaps#199</a>)</p>
<p>I *think* I did this right</p>scottleibrandtag:github.com,2008:Repository/67170808/16-05-212016-05-21T22:51:06Z16-05-21: Merge pull request #135 from openaps/dev<p>Merge pull request <a class="issue-link js-issue-link" href="https://github.com/openaps/docs/pull/135">openaps#135</a> from openaps/dev</p>
<p>Dev to master</p>danamlewis