web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-12 12:16:27 +02:00
Code Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
heff 2015-10-09 14:14:17 -07:00
commit e58c2266de
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib.json
View File

@ -148,7 +148,10 @@
"desc": "Merge a submitted patch", "desc": "Merge a submitted patch",
"steps": [ "steps": [
{ "include": "update {{meta.branches.release}}" }, { "include": "update {{meta.branches.release}}" },
{ "include": "pull_request accept" } { "include": "pull_request accept" },
[ "git checkout master", "Checkout the developmet branch" ],
[ "git merge stable", "Merge the patch changes" ],
[ "git push upstream master", "Push the development changes" ]
] ]
} }
}, },