starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-20 12:55:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/screenshot' into develop

Browse Source 
Conflicts:
	res/app/control-panes/dashboard/upload/upload.jade
This commit is contained in:
Simo Kinnunen
2014-05-22 13:38:44 +09:00
parent 9ebb005654 41ed33f5c4
commit 60bdecc5d4
28 changed files with 813 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -24,7 +24,7 @@
"stf-graphics": "git@ghe.amb.ca.local:stf/stf-graphics.git",
"angular-bootstrap": "~0.11.0",
"angular-dialog-service": "~5.0.0",
"ng-file-upload": "~1.2.11",
"ng-file-upload": "~1.4.0",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.6.0",
"bluebird": "~1.2.4",
"angular-tree-control": "~0.1.5",