Merge branch 'basic-wifi-settings' of pi31415/libreCMC-cmh into v1.4
authorRISCI_ATOM <bob@bobcall.me>
Wed, 10 Jan 2018 19:03:51 +0000 (14:03 -0500)
committerGogs <gogs@fake.local>
Wed, 10 Jan 2018 19:03:51 +0000 (14:03 -0500)

Trivial merge