Fixes the latest merge

Browse source

...

This commit is contained in:

Paul Schneider 2015-10-20 18:38:50 +02:00

parent d8a5ebd526

commit 777f4fb4c2

32 changed files with 108 additions and 110 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

web/images/an-pierle-876094_1280.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 262 KiB

BIN

web/images/concert.clear.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 60 KiB

BIN

web/images/drummer-652345_1280.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 276 KiB

BIN

web/images/drummer-652345_1280.s.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 110 KiB

BIN

web/images/drummer-652345_1280.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 34 KiB

BIN

web/images/facebook.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4 KiB

BIN

web/images/live-concert-388160_1280.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 154 KiB

BIN

web/images/live-concert-388160_1280.s.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 57 KiB

BIN

web/images/live-concert-388160_1280.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 24 KiB

BIN

web/images/musician-923526_1.nb.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 28 KiB

BIN

web/images/musician-923526_1.nb.xs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 31 KiB

BIN

web/images/musician-923526_1.nb.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 5.2 KiB

BIN

web/images/musician-923526_1.nbb.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 16 KiB

BIN

web/images/musician-923526_1.nbb.xs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 5.4 KiB

BIN

web/images/musician-923526_1.nbb.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

web/images/musician-923526_1280.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 105 KiB

BIN

web/images/musician-923526_1280.s.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 37 KiB

BIN

web/images/musician-923526_1280.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 49 KiB

BIN

web/images/p8-av4.xxs.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 132 KiB

BIN

web/images/totem-banner.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 76 KiB

BIN

web/images/totem-banner.xs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 23 KiB

BIN

web/images/totem-banner.xxs.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.3 KiB

BIN

web/images/totem.jpg

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 28 KiB

BIN

web/images/totemprod.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 40 KiB

BIN

web/images/twiter.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.1 KiB