commit de app/config
Merge branch 'master' of github.com:edevelop/caledonian