merged
Merge branch 'dev' of github.com:cristian100/buscarsalud
master
master
restored permission
Merge remote-tracking branch 'origin/dev'
s
Merge remote-tracking branch 'origin/dev'
Merge branch 'master' of github.com:cristian100/buscarsalud
Merge remote branch 'origin/master' into dev