xccz
Merge branch 'master' of https://github.com/SenglarSalvatge/enrut.cat

Conflicts:
	posts/views.py
svgbfbnf nf