Изменение
Merge branch 'master' of github.com:qwars/city.qwars.loc

Conflicts:
	html/js/admin.js