diff options
| author | piernov <piernov@piernov.org> | 2016-04-25 19:10:53 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2016-04-25 19:10:53 +0200 |
| commit | 8770f9ddccfafaad935f66ccbf254624b41545f3 (patch) | |
| tree | e07d2e93e95a34e9f70f22f52aafa82c09682e4b /inc/craftmine.inc | |
| parent | b141eb3d70b3dc2d75ee8f2bf2edba1fed71f5b6 (diff) | |
| parent | 8140617aeb2f32f7095a443ca743c6d6915739c6 (diff) | |
| download | candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.gz candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.bz2 candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.xz candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.zip | |
Merge remote-tracking branch 'origin/alexichi' into piernov
Diffstat (limited to 'inc/craftmine.inc')
| -rw-r--r-- | inc/craftmine.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/craftmine.inc b/inc/craftmine.inc index a30538c..33a28d7 100644 --- a/inc/craftmine.inc +++ b/inc/craftmine.inc @@ -7,6 +7,7 @@ function sendCraftMine() { $data = array("gold" => sendMine(), "shop" => sendShop(), "inventory" => Inventory::sendContent(), + "miners" => sendMiners() ); echo json_encode($data); } |