diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 14:42:46 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-02-24 14:42:46 +0100 |
| commit | 7676509fcd6ab0a6c3e666c00c6ff96ecc1f7ffb (patch) | |
| tree | 4af40ce8a204c43e99bf3026b1db2cf9679d1502 /client/js/services/Compute.js | |
| parent | d2f5ae5c83ef5bc41cf430ace79769459b4acbf8 (diff) | |
| parent | c511010ec41e57d99d1756780ee968269fa2b8fb (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client/js/services/Compute.js')
| -rw-r--r-- | client/js/services/Compute.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index c5c8da9..70359ee 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -31,8 +31,8 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Return services objects return { - getMachines: getMachines - pullData: pullData + getMachines: getMachines, + pullData: pullData, data:data }; |