Merge branch 'master' into next

Browse source

...

This commit is contained in:

Paulus Schoutsen 2016-06-18 12:06:50 -07:00

parent bccd6d460d fd7164e3d2

commit 14a04556ac

27 changed files with 193 additions and 96 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

source/images/blog/2016-06-pycon/crew.jpg Normal file

View file

Binary file not shown.

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

BIN

source/images/blog/2016-06-pycon/sprint.jpg Normal file

View file

Binary file not shown.

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