Fixed Conflicts:
bower.json js/directives.js views/includes/sidebar.html
This commit is contained in:
commit
b94f66f32e
17 changed files with 79 additions and 40 deletions
|
|
@ -22,6 +22,7 @@
|
|||
"angular-moment": "~0.7.1",
|
||||
"socket.io-client": ">=1.0.0",
|
||||
"mousetrap": "1.4.6",
|
||||
"zeroclipboard": "~2.1.6"
|
||||
"zeroclipboard": "~2.1.6",
|
||||
"ng-idle": "*"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue