Merge branch 'master' of git.ungleich.ch:dynamicweb into develop

Browse source

Conflicts:
	.gitignore
	dynamicweb/settings.py
	requirements.txt

...

This commit is contained in:

rascencio 2015-09-19 17:02:36 +02:00

parent e91b87a889 44bf55943f

commit acca06a11d

10 changed files with 170 additions and 120 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

digitalglarus/static/digitalglarus/img/price_1.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 191 KiB