Merge branch 'current' into next

Browse source

...

This commit is contained in:

Paulus Schoutsen 2017-03-01 23:40:45 -08:00

parent 070ca21130 18ca04eb5b

commit 8d7811c7c4

31 changed files with 375 additions and 65 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/merchandise/shirt-frontpage.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 102 KiB After Width:  |  Height:  |  Size: 185 KiB

BIN

source/images/supported_brands/fido.png Normal file

View file

Binary file not shown.

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

BIN

source/images/supported_brands/windows.png Normal file

View file

Binary file not shown.

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