Fix Conflicts:

css/main.css views/modals/qr-address.html
2014-08-01 13:14:10 -03:00 · 2014-08-01 13:14:10 -03:00 · a3baab397c
commit a3baab397c
parent 1cd1ad2ff8 85e78f2797
9 changed files with 46 additions and 29 deletions
--- a/views/join.html
+++ b/views/join.html
@ -46,6 +46,7 @@
              </div>
            </div>

+            <div style="clear: both;"></div>
            <label for="joinPassword"> User info </label>
            <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
            <input type="password" class="form-control"