Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tor Hveem 2013-10-16 17:51:43 +02:00
commit 0dd525477f

View file

@ -213,7 +213,7 @@
<div class="navbar navbar-inverse navbar-fixed-bottom"> <div class="navbar navbar-inverse navbar-fixed-bottom">
<form class="form form-horizontal" ng-submit="sendMessage()"> <form class="form form-horizontal" ng-submit="sendMessage()">
<div class="input-group"> <div class="input-group">
<input id="sendMessage" type="text" class="form-control" ng-model="command" autofocus> <input id="sendMessage" type="text" class="form-control" autocomplete="off" ng-model="command" autofocus>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btn-primary">Send</button> <button class="btn btn-default btn-primary">Send</button>
</span> </span>