Merge branch 'current' into next

2016-10-06 22:13:18 -07:00 · 2016-10-06 22:13:18 -07:00 · 5da7bfaa9e
commit 5da7bfaa9e
parent 861c88d177 baeeab80be
47 changed files with 132 additions and 36 deletions
--- a/source/images/supported_brands/cpu.png
+++ b/source/images/supported_brands/cpu.png
--- a/source/images/supported_brands/limitlessled_logo.png
+++ b/source/images/supported_brands/limitlessled_logo.png
--- a/source/images/supported_brands/linux_battery.png
+++ b/source/images/supported_brands/linux_battery.png
--- a/source/images/supported_brands/magic_light.png
+++ b/source/images/supported_brands/magic_light.png
--- a/source/images/supported_brands/mhz19_logo.png
+++ b/source/images/supported_brands/mhz19_logo.png
--- a/source/images/supported_brands/miflora.png
+++ b/source/images/supported_brands/miflora.png
--- a/source/images/supported_brands/onewire.png
+++ b/source/images/supported_brands/onewire.png
--- a/source/images/supported_brands/restful.png
+++ b/source/images/supported_brands/restful.png
--- a/source/images/supported_brands/serial_pm.png
+++ b/source/images/supported_brands/serial_pm.png
--- a/source/images/supported_brands/simplepush.png
+++ b/source/images/supported_brands/simplepush.png
--- a/source/images/supported_brands/supervisord.png
+++ b/source/images/supported_brands/supervisord.png
--- a/source/images/supported_brands/system_monitor.png
+++ b/source/images/supported_brands/system_monitor.png
--- a/source/images/supported_brands/tcp_ip.png
+++ b/source/images/supported_brands/tcp_ip.png
--- a/source/images/supported_brands/tomato.png
+++ b/source/images/supported_brands/tomato.png