devel = false
Merge branch 'master' of https://github.com/MaciejPuczkowski/bramywiary

Conflicts:
	DniWiary/settings.py