Merge branch 'current' into next

Browse source

...

This commit is contained in:

Robbie Trencheny 2017-04-16 16:48:43 -07:00

parent d41913787d 58846b8c00

commit 080cf64170

No known key found for this signature in database

GPG key ID: 57406F414538A33B

41 changed files with 363 additions and 117 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/supported_brands/crimereports.png Normal file

View file

Binary file not shown.

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

BIN

source/images/supported_brands/metoffice.jpg Normal file

View file

Binary file not shown.

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

BIN

source/images/supported_brands/mystrom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 11 KiB