Merge branch 'bobthe'
Conflicts: test/data/test.db
This commit is contained in:
commit
8f6cdabde3
41 changed files with 1519 additions and 744 deletions
|
@ -51,6 +51,7 @@
|
|||
<script src="static/lib/angulartics-mixpanel.js"></script>
|
||||
<script src="static/lib/angulartics-google-analytics.js"></script>
|
||||
<script src="static/lib/angular-md5.js"></script>
|
||||
<script src="static/lib/bindonce.min.js"></script>
|
||||
|
||||
<script src="static/lib/angular-moment.min.js"></script>
|
||||
<script src="static/lib/angular-cookies.min.js"></script>
|
||||
|
|
Reference in a new issue