Merge branch 'develop'

Browse source

...

This commit is contained in:

Tom 2016-05-08 18:14:51 +00:00

parent 6e82b50f99 3186194b3f

commit 5c544e6a8d

49 changed files with 217 additions and 181 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

media/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/00/3a/003ac171-09bc-4032-b743-31747a66725d/twitter_header_thankyou_confetti_dark.png__120x120_q85_crop_subsampling-2.png Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/0e/5a/0e5a91f6-7a7f-4bd3-914b-6fe45cb1c0f7/glarus-meetup.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/0f/67/0f67c096-d415-41b5-91f4-eaf6cdd88025/radio-mic-mike.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/12/69/12691306-fb1e-4f9d-b4ae-d5c5d7230491/digitalglarus_meeting_luchsingen_nicoshottelius_.png__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/14/94/14949dd7-6372-4c1f-b788-26592d278893/header-bg.jpg__210x10000_q85_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/1b/26/1b267709-4e35-47a0-91fc-2cd09e9b04b3/jazz_background.png__120x120_q85_crop_subsampling-2.png Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/60/a4/60a49d16-edc5-4a89-b1b0-1c24645c492e/fondue.png__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/64/9a/649a64f6-353c-46b0-a086-8b8c12a59a76/rackfromtop.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/7e/c8/7ec8b6bd-33e2-49f1-9714-c67a3e7b317f/digitalglarus_opennebula_workshop_nico_back.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/7f/f5/7ff594a0-2bc0-4ebb-a378-14c12bb54845/wissen-dark.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/86/c5/86c57854-980e-49e4-ad41-4aad76193642/newspaperboy.png__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg__16x16_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 456 B

BIN

media/filer_public_thumbnails/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg__180x180_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg__32x32_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 768 B

BIN

media/filer_public_thumbnails/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg__48x48_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/88/5d/885d7b92-37a8-4267-970e-37b8bde0bfa4/slide-3.jpg__64x64_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/8a/63/8a63c4e5-0dc8-48e3-b809-96ab5b52ea50/manifesto.png__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/a6/27/a6277491-6326-4888-8359-5c8e5aa71038/opennebulaconf_nicoschottelius_speech_cdist.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/a9/94/a994bc7b-82db-453b-ba09-bc40a571dfd9/digitalglarus_whynotzurich.png__210x10000_q85_subsampling-2.png Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/aa/9b/aa9b54c0-30c7-4efe-9fb0-a38ee2581796/16494988669_f4c6d00da4_b.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/bb/99/bb99bd4a-b925-492f-8b5b-3ae2984f0ab8/magical-bern-switzerland.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg__16x16_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 443 B

BIN

media/filer_public_thumbnails/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg__180x180_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg__32x32_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 772 B

BIN

media/filer_public_thumbnails/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg__48x48_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/bb/c0/bbc0cd6e-653b-40af-88e4-91d09f362dca/slide-2.jpg__64x64_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/cc/a8/cca85891-c5f9-4053-815b-003579f2a042/breakfast_coffee_long_loaf_newspaper_5461_1920x1080.png__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/d9/9c/d99cafaa-c344-4b1f-adf0-187e0cddd80e/steam-train-small.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/db/e7/dbe708ff-86b5-448f-aab1-c84fb6c6730a/dsc_4967-small2.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/f1/2f/f12f5f1e-4ac4-40c9-b4cd-35a825725d86/digitalglarus_jazz_concert_theband.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/f2/78/f2785449-e7b9-4260-b5d7-b30b16502b88/connectivity.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/f2/78/f2785449-e7b9-4260-b5d7-b30b16502b88/connectivity.jpg__640x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/f4/40/f440bcee-aced-4842-84ac-c78d6ac703b4/digitalglarus_vision_background_nico.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/fb/0e/fb0e2764-f19f-44f8-9ff7-1e4e9b84d440/14473379828_84376f1229_h.jpg__120x120_q85_crop_subsampling-2.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg__16x16_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 440 B

BIN

media/filer_public_thumbnails/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg__180x180_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg__32x32_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 799 B

BIN

media/filer_public_thumbnails/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg__48x48_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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

BIN

media/filer_public_thumbnails/filer_public/ff/4e/ff4e5d8c-6411-4615-8481-26081d63c912/slide-1.jpg__64x64_q85_crop_subsampling-2_upscale.jpg Normal file

View file

Binary file not shown.

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