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

Merge branch 'master' into feature/socket-io-support

Browse source 
Fix conflicts:
	js/app.js
	js/controllers/signin.js
This commit is contained in:
Gustavo Cortez 2014-04-17 11:58:11 -03:00
commit 2454d930fa
9 changed files with 63 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

1
index.html
View file

@ -337,6 +337,7 @@
<script src="js/filters.js"></script>
<script src="js/services/socket.js"></script>
<script src="js/services/walletFactory.js"></script>
<script src="js/services/controllerUtils.js"></script>
<script src="js/controllers/header.js"></script>
<script src="js/controllers/home.js"></script>