Sebastiaan Pasma 391201471d Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514 ... # Conflicts: # i18n/po/template.pot # src/js/controllers/amount.js # www/css/main.css		2018-08-02 15:12:40 +02:00
..
css	Merges amount directive	2018-07-30 17:35:15 +08:00
fonts	Updated git ignore file	2017-06-19 16:42:18 +09:00
img	Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514	2018-08-02 15:12:40 +02:00
js	Added chart libs	2017-07-07 11:55:46 +09:00
misc	- remove native audio plugin references	2018-06-25 11:07:13 +02:00
roboto-font	build(www): rename public directory to www	2016-10-06 00:26:57 -04:00
views	Merge remote-tracking branch 'origin/wallet/task/440' into wallet/task/514	2018-08-02 15:12:40 +02:00
cordova.js	build(www): rename public directory to www	2016-10-06 00:26:57 -04:00
index.html	Adds amount directive	2018-07-30 16:49:57 +08:00