Merge branch 'master' into dev

2013-08-19 00:23:13 -05:00 · 2013-08-19 00:23:13 -05:00 · d62931098d
commit d62931098d
parent 0ceb362f0b 05dc2a3119
15 changed files with 212 additions and 156 deletions
--- a/www/index.html
+++ b/www/index.html
@ -47,7 +47,7 @@
        </div>
        <div class="row">
            <div class="span8">
-                <h3>Loaded Channels</h3>
+                <h3>Public Channels</h3>
                <table id="channeldata" class="table table-striped table-bordered">
                    <thead>
                        <tr>