Merge branch 'develop'

Browse source

...

This commit is contained in:

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

parent 2c0f8c4530 700406a16c

commit 32b64f2eb7

48 changed files with 212 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