Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed May 29, 2018
2 parents c3585a3 + 868a542 commit ab368ab
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 21 deletions.
11 changes: 6 additions & 5 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.14.87'
const version = '1.14.88'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.14.87",
"version": "1.14.88",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.87';
$version = '1.14.88';

// rounding mode
const TRUNCATE = 0;
Expand Down
7 changes: 4 additions & 3 deletions php/ccex.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@ public function describe () {
),
),
'commonCurrencies' => array (
'IOT' => 'IoTcoin',
'BLC' => 'Cryptobullcoin',
'XID' => 'InternationalDiamond',
'LUX' => 'Luxmi',
'CRC' => 'CoreCoin',
'IOT' => 'IoTcoin',
'LUX' => 'Luxmi',
'VIT' => 'VitalCoin',
'XID' => 'InternationalDiamond',
),
));
}
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

# ----------------------------------------------------------------------------

__version__ = '1.14.87'
__version__ = '1.14.88'

# ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.87'
__version__ = '1.14.88'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.87'
__version__ = '1.14.88'

# -----------------------------------------------------------------------------

Expand Down
7 changes: 4 additions & 3 deletions python/ccxt/async/ccex.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ def describe(self):
},
},
'commonCurrencies': {
'IOT': 'IoTcoin',
'BLC': 'Cryptobullcoin',
'XID': 'InternationalDiamond',
'LUX': 'Luxmi',
'CRC': 'CoreCoin',
'IOT': 'IoTcoin',
'LUX': 'Luxmi',
'VIT': 'VitalCoin',
'XID': 'InternationalDiamond',
},
})

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.14.87'
__version__ = '1.14.88'

# -----------------------------------------------------------------------------

Expand Down
7 changes: 4 additions & 3 deletions python/ccxt/ccex.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ def describe(self):
},
},
'commonCurrencies': {
'IOT': 'IoTcoin',
'BLC': 'Cryptobullcoin',
'XID': 'InternationalDiamond',
'LUX': 'Luxmi',
'CRC': 'CoreCoin',
'IOT': 'IoTcoin',
'LUX': 'Luxmi',
'VIT': 'VitalCoin',
'XID': 'InternationalDiamond',
},
})

Expand Down

0 comments on commit ab368ab

Please sign in to comment.