подвал
Merge branch 'origin/master'
galer
Merge branch 'alexey'

Conflicts:
	webshop/static/css/style.css
исправлен
Merge branch 'master'
10.2014
доделал карточку товара
Merge branch 'work'
Merge branch 'alexey'
Merge branch 'github.com_alexey/master'
настройки