diakonos conf
Merge branch 'master' of github.com:mallowigi/settings-repository