Database config
Merge branch 'master' of https://github.com/romanmussi/estudio2x.git
Database config