merge into master
merge dev_1.0
new branch
new branch, dont push origin
merge fix conflict
merge issue#2 to master
Sample Review
Merge pull request #1 from charmelle/master

Pull Request issue#3 [Done]