merge from sanghee

Browse source

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>

...

This commit is contained in:

Nico Schottelius 2015-08-27 18:21:15 +02:00

parent 2bf346495e 2e6cd7d8ef

commit 59ef61dfe8

2 changed files with 1 additions and 4 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/img_2.jpg

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 235 KiB After Width:  |  Height:  |  Size: 220 KiB