Merge pull request #385 from matiu/feature/txprposal-limit

Feature/txprposal limit
This commit is contained in:
Mario Colque 2014-05-15 17:58:48 -03:00
commit 7a9e18023d
17 changed files with 141 additions and 97 deletions

View file

@ -124,7 +124,7 @@
<div class="row" ng-show="!$root.wallet">
<div class="large-12 columns text-right">
Copay
<small>v. 0.0.5</small>
<small>v{{version}}</small>
</div>
</div>
<div class="row p10t" ng-show="$root.wallet">
@ -666,6 +666,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
<script src="lib/qrcode-generator/js/qrcode.js"></script>
<script src="lib/angular-qrcode/qrcode.js"></script>
<script src="lib/angular-route/angular-route.min.js"></script>
<script src="lib/angular-resource/angular-resource.min.js"></script>
<script src="lib/angular-foundation/mm-foundation.min.js"></script>
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
<script src="lib/peerjs/peer.js"></script>