conf db
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
tema
Merge branch 'master' of https://github.com/rikidpr/manteniket.git