Fix Conflicts:

views/modals/qr-address.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 11:28:16 -03:00
commit 1cd1ad2ff8
3 changed files with 15 additions and 2 deletions

View file

@ -258,6 +258,11 @@ a:hover {
margin-bottom: 20px;
}
.box-setup label small.has-error {
font-size: 11px;
color: #FFA59B;
}
.last-transactions {
margin-bottom: 2rem;
background-color: #E8EAEF;