merge dev
merge
Merge branch 'master' of local repository into dev