1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 16:18:07 +01:00
Commit Graph

774 Commits

Author SHA1 Message Date
Dan Finlay
926abc12b1 Add support for alternative ENS TLDs
Fixes #2428
2017-10-22 22:12:12 -07:00
Dan Finlay
e564ed8d4c Version 3.11.2 2017-10-21 15:40:57 -07:00
Dan Finlay
56dcf7c011 Version 3.11.1 2017-10-20 14:07:54 -07:00
kumavis
a71c95b987 changelog entry for filter fix 2017-10-20 12:32:15 -07:00
Dan Finlay
cafabf914f Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-17 13:27:16 -07:00
Dan Finlay
9c45af3e25 Bump changelog 2017-10-17 13:26:16 -07:00
Dan Finlay
10011395f6 Bump changelog 2017-10-16 04:14:09 -07:00
Dan Finlay
d0d082d70c Merge branch 'master' into i1340-SynchronousInjection 2017-10-12 13:25:19 -04:00
Dan Finlay
4ed00ea2d8 Version 3.11.0 2017-10-11 15:54:17 -04:00
Dan Finlay
9f063c320c Fix link to token support page 2017-10-11 15:15:31 -04:00
Kevin Serrano
a387def701
Changelog addition. 2017-10-10 08:50:59 -07:00
Dan Finlay
0c61695656 Merge branch 'master' into SignTypedData 2017-10-06 14:03:04 -07:00
Dan Finlay
0146b55d6d Check status of pending transactions on startup
Fixes #1531
2017-10-06 11:41:28 -07:00
Dan Finlay
52bfed5d13 Bump changelog 2017-10-05 14:53:22 -07:00
Dan Finlay
8d45b96db6 Version 3.10.9 2017-10-05 12:44:48 -07:00
frankiebee
554a3ac4e4 add to CHANGELOG.md 2017-10-05 12:12:31 -07:00
Kevin Serrano
4b0e6a0a77 Merge branch 'master' into RemoveSlackLink 2017-10-02 15:23:27 -07:00
Dan Finlay
d5b0d8af4f Version 3.10.8 - Fix Currency Conversion
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
2017-09-29 20:57:15 -07:00
Dan Finlay
14d58e630d Version 3.10.7 2017-09-29 13:17:21 -07:00
Dan Finlay
861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
Dan Finlay
b473d440a3 Version 3.10.6 2017-09-27 15:14:40 -07:00
Dan Finlay
ea12be2c1b Bump changelog 2017-09-27 14:44:44 -07:00
Dan Finlay
a453eb132d Version 3.10.5 2017-09-27 12:10:25 -07:00
Dan Finlay
8d3fec42d0 Fix bug where block gas limit was incorrectly parsed. 2017-09-27 12:09:32 -07:00
tmashuang
734490c58c Add AUD, HKD, SGD, IDR, PHP to currency conversion list 2017-09-27 11:16:38 -07:00
Dan Finlay
d77e0aff4d Version 3.10.4 2017-09-27 11:15:22 -07:00
Kevin Serrano
e998d528f0 Merge branch 'master' into RemoveSlackLink 2017-09-26 15:47:31 -07:00
Dan Finlay
57b5f15265 Remove slack link 2017-09-26 10:01:16 -07:00
Kevin Serrano
16ba2e6a30
Merge branch 'master' into new-currency-test 2017-09-26 09:51:20 -07:00
Dan Finlay
b46cb3ecb5 Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(

Fixes #2162
2017-09-26 09:25:04 -07:00
Dan Finlay
8a874824a8 Version 3.10.3 2017-09-21 11:45:33 -07:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test 2017-09-20 09:40:33 -07:00
kumavis
3a3e1511e5 changelog - add note on filter fixes 2017-09-19 11:30:06 -07:00
kumavis
0424ab3e48 v3.10.2 - changelog
add changelog
2017-09-18 22:44:40 -07:00
Dan Finlay
92e738d17c Bump changelog 2017-09-18 14:37:28 -07:00
Kevin Serrano
899a12cb2a
Fix the changelog again. 2017-09-18 12:04:46 -07:00
Kevin Serrano
90e0c10dc2
Add additional attribution to changelog. 2017-09-18 12:02:47 -07:00
Dan Finlay
c90c904f95 Version 3.10.1 2017-09-18 11:47:59 -07:00
Dan Finlay
fa50bf9587 Merge pull request #2075 from MetaMask/mixed-case
Specific error for send screen: address checksum fails
2017-09-18 11:46:50 -07:00
Dan Finlay
545cbbebb9 Merge branch 'master' into fix-tooltip 2017-09-18 11:20:00 -07:00
Dan Finlay
67accea693 Merge branch 'master' into mixed-case 2017-09-18 11:17:00 -07:00
Dan Finlay
99856189ed Merge pull request #2093 from MetaMask/max-validation
High GasLimit Validation Warning
2017-09-18 11:14:26 -07:00
kumavis
c634ca3ba4 Merge branch 'master' into filter-leak-fix3 2017-09-13 15:27:08 -07:00
kumavis
6ba448edaf changelog - add note of filter memory leak fix 2017-09-13 15:26:00 -07:00
Kevin Serrano
3d36d565af
Bump changelog. 2017-09-13 12:26:24 -07:00
Kevin Serrano
5305d414b5
changelog. 2017-09-12 16:16:29 -07:00
Dan Finlay
c8736b70b7 Bump changelog 2017-09-12 15:07:41 -07:00
Kevin Serrano
243be92ac1
Changelogaroo. 2017-09-12 12:24:02 -07:00
Kevin Serrano
111e67fa36
Add to changelog. 2017-09-12 09:35:24 -07:00
Kevin Serrano
1a0c465dc9
Change the changelog 2017-09-11 16:48:18 -07:00
Dan Finlay
6c318f238d Version 3.10.0 2017-09-11 14:37:53 -07:00
Kevin Serrano
06889377c8
Remove markdown from changelog. 2017-09-11 14:00:35 -07:00
Kevin Serrano
2e18dd27a4
Merge github.com:MetaMask/metamask-extension into rejectallunapproved 2017-09-11 13:58:46 -07:00
Kevin Serrano
68b22d409a Merge pull request #2049 from MetaMask/i1938-removecryptopermissions
Remove cryptonator from chrome manifest file
2017-09-10 11:05:52 -07:00
kumavis
5fa0b992a7 Merge pull request #2057 from MetaMask/Version-3.9.13
Version 3.9.13
2017-09-08 13:06:59 -07:00
Dan Finlay
585a32534d Version 3.9.13 2017-09-08 12:17:58 -07:00
kumavis
bcb60f8ef2 Merge branch 'master' into i1938-removecryptopermissions 2017-09-07 23:05:15 -07:00
Kevin Serrano
a7f0255085
Add to changelog. 2017-09-07 18:18:14 -07:00
Kevin Serrano
2200a1142f
Bump changelog. 2017-09-07 17:55:49 -07:00
Kevin Serrano
55b07b2b4a
Changelog and attribution. 2017-09-07 15:06:57 -07:00
Kevin Serrano
7ff5fd8691
Changelog bump 2017-09-06 14:04:17 -07:00
Dan Finlay
5e934994d1 Version 3.9.12 2017-09-06 13:33:30 -07:00
Kevin Serrano
32c799a135 Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning
Make eth_sign deprecation warning more useful
2017-09-05 11:49:48 -07:00
Dan Finlay
90272e252f Make eth_sign deprecation warning more useful
Link to descriptive article that demonstrates the new preferred method.
2017-09-05 11:44:26 -07:00
Dan Finlay
70a61f8712 Make web3 deprecation notice more useful
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
Dan Finlay
01f961976a Bump changelog 2017-09-01 11:42:44 -07:00
Kevin Serrano
4b058bc7eb Merge branch 'master' into i1986-AddVersionToStateLogs 2017-08-29 18:09:39 -07:00
Thomas Huang
725e4aae7f Update changelog 2017-08-29 18:00:57 -07:00
Dan Finlay
54ce267a9f Add version to state logs
Fixes #1986
2017-08-29 11:42:44 -07:00
kumavis
76de053b0b Merge branch 'master' into inpage-provider-fixes 2017-08-28 11:29:47 -07:00
kumavis
6bff55ba2a inpage - add changelog note 2017-08-28 11:29:13 -07:00
Dan Finlay
72bccec440 Version 3.9.11 2017-08-24 00:16:19 -07:00
Dan Finlay
941e5ff125 Bump changelog 2017-08-23 22:29:28 -07:00
Dan Finlay
ad40fc6b42 Bump changelog 2017-08-23 21:54:26 -07:00
Dan Finlay
df78020c18 Version 3.9.10 2017-08-23 11:51:10 -07:00
Dan Finlay
09235a5924 Merge branch 'master' into useLocalNonce 2017-08-23 11:14:25 -07:00
Dan Finlay
1d7781da6b Bump changelog 2017-08-23 11:13:35 -07:00
Dan Finlay
e0ccdcd6fd Remove eth-tx-viz link from tx history icons 2017-08-23 09:40:24 -07:00
Dan Finlay
f24cfea35e Version 3.9.9 2017-08-18 16:12:36 -07:00
Kevin Serrano
7e6c714f78 Merge branch 'master' into i1912-TokenPrecisionFix 2017-08-18 10:48:55 -07:00
Dan Finlay
c90ff2847f Bump changelog 2017-08-17 15:35:52 -07:00
Dan Finlay
d7a34514b0 Fix token balance precision rendering
Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`.

Fixes #1912
2017-08-17 14:53:08 -07:00
Dan Finlay
e3a5c3684d Bump changelog 2017-08-16 17:06:45 -07:00
Dan Finlay
27d030b1a1 Version 3.9.8 2017-08-16 15:43:34 -07:00
Dan Finlay
c6cfa2157b Bump changelog 2017-08-16 09:49:44 -07:00
kumavis
33bdf86a2b v3.9.7 update changelog 2017-08-15 12:58:53 -07:00
frankiebee
be7f5bd365 Add to CHANGELOG 2017-08-15 12:13:06 -07:00
frankiebee
d4849f67f9 Add to CHANGELOG 2017-08-11 15:53:01 -07:00
kumavis
2b409fb60b 3.9.6 2017-08-09 23:05:50 -07:00
sdtsui
50fc9c9658 Improve readability of changelog 2017-08-06 10:02:37 -07:00
kumavis
a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis
c82908e843 v3.9.5 2017-08-04 14:16:19 -07:00
kumavis
75b397b158 Merge branch 'master' into NewUI 2017-08-03 22:21:13 -07:00
kumavis
a444326a1e v3.9.4 2017-08-03 22:06:26 -07:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis
10c6aeb2f8 v3.9.3 2017-08-03 17:01:09 -07:00
Dan Finlay
6c25f9950b Bump changelog 2017-07-27 15:25:00 -07:00
Dan Finlay
eb92d65c4d Add Levenshtein item to changelog 2017-07-26 16:57:58 -07:00
Dan Finlay
6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
Dan Finlay
8b1726cc55 Live update blacklist from Infura 2017-07-26 16:30:54 -07:00
Dan Finlay
e3b5bb2052 Merge pull request #1837 from MetaMask/i1833-levencheck
Levenshtein Checking Logic Added To Blacklist
2017-07-26 16:25:30 -07:00
Kevin Serrano
aa282b4e3a
Give credit where it is due 2017-07-26 15:31:16 -07:00
Kevin Serrano
a639543665
Changelog bump 2017-07-26 15:29:13 -07:00
Dan Finlay
b50c10f373 Version 3.9.2 2017-07-26 14:15:24 -07:00
frankiebee
ab01358a48 Add stack traces both in errors and as a way to track txMetas 2017-07-25 16:08:31 -04:00
Dan Finlay
dcf025782b Version 3.9.1 2017-07-19 12:24:32 -07:00
Dan Finlay
51c5bebdf5 Lowered minimum gas price to 1 gwei 2017-07-19 11:44:00 -07:00
kumavis
2832713a46 changelog - add nonce-tracker note 2017-07-18 15:30:32 -07:00
kumavis
1e71850582 Merge pull request #1787 from MetaMask/i1637-TransactionOrder
Fix transaction confirmation ordering
2017-07-18 09:34:02 -07:00
frankiebee
948f3880a3 turn off auto faucet and remove file 2017-07-17 17:37:01 -04:00
Dan Finlay
614501e743 Fix transaction confirmation ordering
Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed.

Fixes #1637
2017-07-17 14:18:00 -07:00
Dan Finlay
a4e567ffc5 Add support page link to help page
Also adjust github link to be a new bug link, which goes to the new issue page.
2017-07-17 09:57:16 -07:00
Dan Finlay
5e31fc97cd Redirect from malicious sites faster 2017-07-13 10:38:56 -07:00
Dan Finlay
414b979219 Version 3.9.0 2017-07-12 16:38:56 -07:00
Dan Finlay
c6f867ef67 Merge branch 'master' into Version-3.8.6 2017-07-12 16:09:11 -07:00
Dan Finlay
2c5b9da06a Bump changelog 2017-07-12 13:14:18 -07:00
Dan Finlay
eddc8cfee7 Version 3.8.6 2017-07-11 16:00:20 -07:00
Dan Finlay
6811fb2679 Merge branch 'master' into 3.8.5 2017-07-11 15:52:19 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
Dan Finlay
d97c6533b8 Remove local nonce error setting. 2017-07-11 12:00:17 -07:00
kumavis
de967d2dfd 3.8.5 2017-07-07 20:05:03 -07:00
Dan Finlay
04a0b949a2 Version 3.8.4 2017-07-07 11:24:33 -07:00
Dan Finlay
289fdfb701 Version 3.8.3 2017-07-06 10:05:51 -07:00
Dan Finlay
b87d10ab1d Bump changelog 2017-07-05 23:26:58 -07:00
Dan Finlay
52a6b9f103 Reenable Default Token List
Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.
2017-07-05 10:30:48 -07:00
Dan Finlay
af8015c1c5 Version 3.8.2 2017-07-03 18:06:47 -07:00
Kevin Serrano
36e0fef854 Merge branch 'master' into i1720-NoSpinnerOnConfig 2017-07-03 15:24:10 -07:00
Dan Finlay
d3c7ba31c5 Bump changelog 2017-07-03 15:13:26 -07:00
Dan Finlay
1503dba5ca No longer show network spinner on config screen
The config screen is used to select networks, so we must not block it with network loading indication.
2017-07-03 13:51:39 -07:00
Dan Finlay
2e7be151c5 Version 3.8.1 2017-06-30 13:55:04 -07:00
Thomas Huang
7de87154e8 Merge branch 'master' into NoPopularTOkens 2017-06-30 10:55:01 -07:00
Thomas Huang
72f79de173 Merge branch 'master' into RemoveTokenSending 2017-06-30 10:49:40 -07:00
Dan Finlay
0c011d0fda Remove send button
Some token precisions are not respected by TokenFactory, so it's not sufficient for a default send form. Removing for now.
2017-06-30 10:28:27 -07:00
Dan Finlay
8abd592034 Stop loading popular tokens by default
Improves performance when loading the token tab.
2017-06-30 10:26:45 -07:00
Dan Finlay
8179f5f84c Bump token-tracker to 1.1.2
To restore older firefox compatibility.
Fixes #1696
2017-06-30 10:11:24 -07:00
Dan Finlay
c7f2fd279d Bump token-tracker to 1.1.1
Includes a critical decimal-handling fix.
Also reduces number of symbol and precision queries after initial load.
2017-06-30 09:47:25 -07:00
Dan Finlay
d7bcd9458f Version 3.8.0 2017-06-28 10:41:58 -07:00
Thomas Huang
d2278699da Merge pull request #1690 from MetaMask/i1669-StateCopyButton
Add copy state logs button
2017-06-28 10:33:57 -07:00
Dan Finlay
1b8a4395ab Add copy state logs button 2017-06-28 10:22:51 -07:00
Thomas Huang
bd523102fe Merge pull request #1634 from MetaMask/i784-SendTokenButton
Add send token button (link to TokenFactory)
2017-06-28 10:09:58 -07:00
Thomas Huang
ffd3773ef3 Merge pull request #1620 from MetaMask/i1616-AddTokenAdding
Add ability to add tokens to token list
2017-06-28 10:07:49 -07:00
Dan Finlay
ddba2af415 Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice
I1473 dapp default gas price
2017-06-27 21:00:08 -07:00
frankiebee
db2836a1ae dont stop retrying brodcasting txs 2017-06-27 14:19:28 -07:00
Thomas Huang
ca832959c2 Update change log 2017-06-27 10:34:02 -07:00
Thomas Huang
8194b398f6 Merge branch 'master' into i1584-seederror 2017-06-26 16:32:47 -07:00
Kevin Serrano
d6c14f4609
Bump changelog. 2017-06-26 16:15:11 -07:00
Kevin Serrano
f2cfbda1c9
Bump changelog. 2017-06-26 15:48:41 -07:00
Dan Finlay
b04d1de447 Merge branch 'master' into i784-SendTokenButton 2017-06-23 11:00:58 -04:00
Dan Finlay
06706f6e1b Merge branch 'master' into i1616-AddTokenAdding 2017-06-23 08:50:44 -04:00
Kevin Serrano
f022c7c714 Merge pull request #1603 from MetaMask/AddTokenList
Add popular token list
2017-06-22 17:28:10 -07:00
Dan Finlay
2f4ebea306 Bump changelog 2017-06-20 18:26:08 -07:00
Kevin Serrano
b3a6df2dca
Bump changelog. 2017-06-20 15:41:34 -07:00
Dan Finlay
f6cc6c6271 Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-19 19:04:16 -07:00
Dan Finlay
41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -07:00
Dan Finlay
60855b0510 Add send button to TokenFactory
A simple solution to a temporary token send screen: Linking to EtherScan.

Will hold us over until we make our own token send view.
2017-06-19 19:02:13 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
Dan Finlay
48789f2a3d Add ability to add tokens to token list
Fiex #1616
2017-06-15 16:22:53 -07:00
Dan Finlay
39c7ed230d Merge remote-tracking branch 'origin/master' into AddTokenList 2017-06-15 13:44:58 -07:00
Dan Finlay
0fd32e67d4 Do not mark slowly mined txs as failed.
Fixes #1567

Also seems to fix #1556

Also improves resubmit performance by only resubmitting on `latest`.
2017-06-14 12:01:45 -07:00
Kevin Serrano
74d15f5cb0
Bump changelog. 2017-06-14 10:13:34 -07:00
Dan Finlay
5c9a228848 Add token list note to changelog 2017-06-13 17:57:18 -07:00
Kevin Serrano
141e66171b Merge pull request #1600 from MetaMask/i1554-ensSymFix
ENS symbol renders on proper networks
2017-06-13 14:31:58 -07:00
Kevin Serrano
e9e43637df
Bump changelog. 2017-06-12 16:57:31 -07:00
Dan Finlay
844159cb18 Version 3.7.8 2017-06-12 15:57:01 -07:00
Frankie
3da887e56e Merge branch 'master' into qrPrefix 2017-06-12 15:09:53 -07:00
frankiebee
b712e7ce64 add to CHANGELOG 2017-06-12 14:48:55 -07:00
kumavis
27220b7bcd Merge branch 'master' into i#1203MainNetSwitch 2017-06-12 13:27:04 -07:00
Dan Finlay
ba254d9041 Merge branch 'master' into currency-fix 2017-06-12 10:32:54 -07:00
Dan Finlay
3e1d648ec0 Merge branch 'master' into gasupdater 2017-06-12 10:26:40 -07:00
Dan Finlay
e9c693eae4 Version bump changelog 2017-06-08 16:44:11 -07:00
kumavis
f994461763 changelog - note on block-tracker warp 2017-06-08 16:21:16 -07:00
Kevin Serrano
f788ba7244
Resolve changelog merging. 2017-06-05 16:27:15 -07:00
Kevin Serrano
deb882bd6e
Merge branch 'master' into currency-fix 2017-06-05 16:26:49 -07:00
Kevin Serrano
0fb38632be
Bump changelog. 2017-06-05 16:25:02 -07:00
Dan Finlay
838ffb62ee Version 3.7.6 2017-06-05 15:36:18 -07:00
Dan Finlay
c8f0802a8e Fix bug that prevented publishing contracts 2017-06-05 15:35:52 -07:00
Dan Finlay
c92afef91d Version 3.7.5 2017-06-05 13:40:26 -07:00
Kevin Serrano
8d8eb0d8ad
bump changelog 2017-06-02 15:20:41 -07:00
Dan Finlay
611cb7ad93 Version 3.7.4 2017-06-02 11:08:59 -07:00
Dan Finlay
d59021f754 Version 3.7.3 2017-06-01 10:18:20 -07:00
Dan Finlay
76a78fdb3b Version 3.7.2 2017-05-31 14:06:13 -07:00
Dan Finlay
1203bd15c2 Add names to contract map & conf view 2017-05-26 10:31:42 -07:00
Dan Finlay
7cd42ae9ba Bump changelog 2017-05-26 00:45:58 -07:00
Thomas Huang
8f9a230d8d Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider
Remove streaming subprovider
2017-05-25 15:04:50 -07:00
Dan Finlay
6064161215 Bump changelog 2017-05-25 13:43:53 -07:00
frankiebee
a2064bd16e add to CHANGELOG 2017-05-24 23:18:09 -04:00
Kevin Serrano
b95f2158bb
bump changelog 2017-05-24 16:23:31 -07:00
Kevin Serrano
10ca3b6467
Fix bug where submit was enabled when invalid params were filled out. 2017-05-24 10:13:43 -07:00
Kevin Serrano
2d739647b9
Bump changelog 2017-05-24 10:01:45 -07:00
Kevin Serrano
45285a5a2f
Merge branch 'master' into i1412-decimalizethegas 2017-05-24 09:55:32 -07:00
Frankie
97ea7454b3 Merge branch 'master' into networkController 2017-05-23 20:36:11 -04:00
frankiebee
c1239608a6 add to CHANGELOG 2017-05-23 20:27:51 -04:00
Dan Finlay
17604f1ef5 Version 3.7.0 2017-05-23 14:49:45 -07:00
Dan Finlay
4dab68c48f Merge branch 'master' into i1409-StalledTxs 2017-05-23 12:24:45 -07:00
Dan Finlay
cd2ad1733d Continually resubmit pending txs 2017-05-23 12:22:15 -07:00
Kevin Serrano
97d19f0f79
Merge branch 'master' into i1412-decimalizethegas 2017-05-23 10:43:59 -07:00
Dan Finlay
be5af7cb4b Throw if ENS Resolver isn't set up
Instead of resolving to name owners, which can encourage inconsistent usage of ENS.

Fixes #1427.
2017-05-22 17:45:29 -07:00
kumavis
99f28527a3 Merge branch 'master' into HelpDebugStalledTxs 2017-05-22 16:21:24 -07:00
Dan Finlay
39f9ffa18a Bump changelog 2017-05-22 15:25:31 -07:00