local changes
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Conflict resolved
gitignore updated
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Commit after merge
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
commit after merge
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Commit after changes
Commit after merge
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy
Merge branch 'master' of https://github.com/bozkay/php-branch-deploy