[Debian-iot-packaging] [openzwave-controlpanel] 66/81: Merge pull request #36 from WoLpH/master

[Dara Adib]

This is an automated email from the git hooks/post-receive script.

daradib-guest pushed a commit to branch debian/master
in repository openzwave-controlpanel.

commit 479460cc65ed845c73e7596c73049fce82a88c3f
Merge: 1ab5d46 c9914a9
Author: Justin Hammond <justin at dynam.ac>
Date:   Tue Nov 24 15:20:54 2015 +0800

    Merge pull request #36 from WoLpH/master
    
    Bootstrap css interface, fixes #35

 .gitignore |    3 +
 cp.html    | 1079 ++++++++++----------
 cp.js      | 3290 +++++++++++++++++++++++++++++++-----------------------------
 3 files changed, 2239 insertions(+), 2133 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/openzwave-controlpanel.git