Merge branch 'master' into appdev
[wolnelektury.git] / src / api / settings.py