anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514

Browse source 
# Conflicts:
#	i18n/po/template.pot
#	src/js/controllers/amount.js
#	www/css/main.css
This commit is contained in:
Sebastiaan Pasma 2018-08-02 15:12:40 +02:00
commit 391201471d
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
22 changed files with 702 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/sass/views/views.scss
View file

@ -50,3 +50,4 @@
@import "includes/logOptions";
@import "includes/checkBar";
@import "cashScan";
@import "review";