aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
Commit message (Collapse)AuthorAgeFilesLines
* Version 3.7.4v3.7.4Dan Finlay2017-06-031-0/+5
|
* Version 3.7.3v3.7.3Dan Finlay2017-06-021-0/+4
|
* Version 3.7.2v3.7.2Dan Finlay2017-06-011-0/+4
|
* Add names to contract map & conf viewDan Finlay2017-05-271-0/+1
|
* Bump changelogDan Finlay2017-05-261-0/+1
|
* Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-261-0/+1
|\ | | | | Remove streaming subprovider
| * Bump changelogDan Finlay2017-05-261-0/+1
| |
* | add to CHANGELOGfrankiebee2017-05-251-0/+1
|/
* bump changelogKevin Serrano2017-05-251-0/+1
|
* Fix bug where submit was enabled when invalid params were filled out.Kevin Serrano2017-05-251-0/+1
|
* Bump changelogKevin Serrano2017-05-251-0/+1
|
* Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-251-0/+5
|\
| * Merge branch 'master' into networkControllerFrankie2017-05-241-0/+8
| |\
| | * Version 3.7.0v3.7.0Dan Finlay2017-05-241-0/+2
| | |
| | * Merge branch 'master' into i1409-StalledTxsDan Finlay2017-05-241-0/+1
| | |\
| | * | Continually resubmit pending txsDan Finlay2017-05-241-0/+1
| | | |
| * | | add to CHANGELOGfrankiebee2017-05-241-0/+2
| | | |
* | | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-241-0/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Throw if ENS Resolver isn't set upDan Finlay2017-05-231-0/+1
| | |/ | |/| | | | | | | | | | | | | Instead of resolving to name owners, which can encourage inconsistent usage of ENS. Fixes #1427.
| * | Merge branch 'master' into HelpDebugStalledTxskumavis2017-05-231-0/+1
| |\ \
| | * | Bump changelogDan Finlay2017-05-231-0/+2
| | |/
| * | Label the pending tx icon with a tooltipDan Finlay2017-05-221-0/+1
| | |
| * | Add transaction number (nonce) to tx listDan Finlay2017-05-221-0/+2
| |/
| * Version 3.6.5v3.6.5Dan Finlay2017-05-181-0/+2
| |
| * Fix bug where decimals in gas inputs gave strange resultsDan Finlay2017-05-181-0/+1
| |
* | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-181-0/+1
|\|
| * Fix bug where edited gas parameters did not take effectDan Finlay2017-05-171-0/+1
| | | | | | | | Fixes #1407
* | Fix merge conflicts.Kevin Serrano2017-05-171-0/+1
|\|
| * changelog - add note on filter fixkumavis2017-05-161-0/+1
| |
* | Changelog bumpKevin Serrano2017-05-171-0/+2
|/
* Bump changelogKevin Serrano2017-05-121-0/+2
|
* Version 3.6.4v3.6.4Dan Finlay2017-05-101-0/+4
|
* Version 3.6.3v3.6.3Dan Finlay2017-05-091-0/+4
|
* Version 3.6.2v3.6.2Dan Finlay2017-05-091-0/+2
|
* Changelog bumpKevin Serrano2017-05-091-0/+1
|
* Add changelog entry for 1390Dan Finlay2017-05-091-0/+1
|
* fix block polling changelog noteDan Finlay2017-05-091-1/+1
|
* Bump changelogDan Finlay2017-05-081-0/+3
|
* Fix changelog formattingDan Finlay2017-05-081-2/+0
|
* Merge branch 'master' into flyswatter-patch-1Kevin Serrano2017-05-021-0/+3
|\
| * Bump changelogDan Finlay2017-05-011-0/+2
| |
* | Correct change datesDan Finlay2017-05-011-2/+2
|/
* Version 3.6.1Dan Finlay2017-05-011-0/+3
|
* Update CHANGELOG.mdkumavis2017-04-291-0/+2
|
* Version 3.6.0Dan Finlay2017-04-281-1/+4
| | | | t # Explicit paths specified without -i or -o; assuming --only paths...
* Merge branch 'master' into Version-3.5.4Dan Finlay2017-04-281-0/+1
|\
| * Add to changelog.Kevin Serrano2017-04-261-0/+1
| |
* | Version 3.5.4v3.5.4Dan Finlay2017-04-261-0/+2
|/
* Allow signature V values over 1 byteDan Finlay2017-04-261-0/+1
| | | | By bumping ethereumjs-tx.
* Bump provider engineDan Finlay2017-04-251-0/+3
| | | | Should now pass test suite, and include several sweet recent fixes!
* Version 3.5.3v3.5.3Dan Finlay2017-04-251-0/+4
|
* Changelog.Kevin Serrano2017-04-061-0/+1
|
* Bump changelogDan Finlay2017-03-301-0/+2
|
* Version 2.5.2v3.5.2v2.5.2Dan Finlay2017-03-291-0/+3
|
* Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-291-0/+1
|\
| * Bump changelogDan Finlay2017-03-281-0/+2
| |
* | Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-0/+4
|\|
| * Version 3.5.1v3.5.1Dan Finlay2017-03-281-0/+2
| |
| * Add to changelog.Kevin Serrano2017-03-281-0/+2
| |
* | Add to changelog.Kevin Serrano2017-03-281-0/+2
|/
* Version 3.5.0v3.5.0Dan Finlay2017-03-281-0/+2
|
* Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-251-0/+3
|\
| * Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-231-0/+1
| |\
| * \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-231-0/+1
| |\ \
| * | | Bump changelogDan Finlay2017-03-231-0/+3
| | | |
* | | | Add to changelog.Kevin Serrano2017-03-231-0/+1
| |_|/ |/| |
* | | Merge branch 'master' into i238-kovanDan Finlay2017-03-231-0/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into i1033-spinnerfixkumavis2017-03-231-0/+2
| |\|
| * | Changelog addition.Kevin Serrano2017-03-211-0/+1
| | |
* | | Changelog bump.Kevin Serrano2017-03-231-0/+1
| |/ |/|
* | Add to CHANGELOGfrankiebee2017-03-231-0/+1
| |
* | Add to changelog.Kevin Serrano2017-03-211-0/+1
|/
* Remove eth-lightwalletDan Finlay2017-03-171-0/+1
|
* Merge branch 'master' into i1165-predictivekumavis2017-03-151-0/+1
|\
| * Changelog addition.Kevin Serrano2017-03-141-0/+1
| |
* | Add to changelog.Kevin Serrano2017-03-151-0/+1
|/
* Bump changelogDan Finlay2017-03-091-0/+2
|
* Version 3.4.0v3.4.0Dan Finlay2017-03-091-0/+2
|
* Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-091-0/+1
|\
| * Bump changelogDan Finlay2017-03-081-0/+1
| |
* | More conflict resolution.Kevin Serrano2017-03-021-0/+1
|\ \
| * \ Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-1/+2
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-021-1/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bump changelogDan Finlay2017-03-011-0/+1
| |/
| * Remove claim for ecRecover supportDan Finlay2017-02-281-1/+0
| |
| * Bump changelogDan Finlay2017-02-251-1/+2
| |
| * Move changelog entryDan Finlay2017-02-221-1/+2
| |
* | Changelog.Kevin Serrano2017-02-231-0/+2
|/
* Version 3.3.0v3.3.0Dan Finlay2017-02-211-0/+2
|
* Add personal_sign and personal_ecRecover supportDan Finlay2017-02-211-1/+2
|
* Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+6
|\
| * Merge branch 'master' into devDan Finlay2017-02-161-0/+7
| |\
* | \ Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+7
|\ \ \ | | |/ | |/|
| * | Bump changelogDan Finlay2017-02-141-0/+2
| | |
| * | Version 3.2.2v3.2.2Dan Finlay2017-02-101-0/+4
| | |
| * | Add to CHANGELOGFrankie2017-02-101-0/+1
| | |
* | | Changelog.Kevin Serrano2017-02-161-0/+1
| |/ |/|
* | Add to changelog.Kevin Serrano2017-02-161-0/+1
| |
* | Merge branch 'dev' into i1085-synchronousnetkumavis2017-02-101-2/+5
|\|
| * Version 3.2.1v3.2.1Dan Finlay2017-02-091-1/+5
| |
* | Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-0/+2
|/
* Version 3.2.0v3.2.0Dan Finlay2017-02-081-1/+3
|
* Add to CHANGELOGFrankie2017-02-021-0/+1
|
* Merge branch 'dev' into i#1048kumavis2017-01-251-0/+2
|\
| * add to CHANGELOGFrankie2017-01-251-0/+1
| |
| * Merge branch 'master' into upToDateFrankie2017-01-211-0/+3
| |\
| * | Bump changelogDan Finlay2017-01-191-0/+2
| | |
* | | 3.1.2kumavis2017-01-251-0/+5
| |/ |/|
* | 3.1.1kumavis2017-01-211-0/+4
|/
* Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-0/+1
|\
| * Add to CHANGELOGFrankie2017-01-191-0/+2
| |
* | Version 3.1.0Dan Finlay2017-01-191-0/+2
| |
* | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-0/+1
|\ \
| * | Bump changelogDan Finlay2017-01-191-0/+2
| | |
* | | Bump changelogDan Finlay2017-01-181-0/+2
|/ /
* | Version 3.0.1Dan Finlay2017-01-171-0/+2
| |
* | Bump changelogDan Finlay2017-01-171-0/+2
|/
* Version 3.0.0Dan Finlay2017-01-171-0/+2
|
* Bump changelog to mention BIP44 fixDan Finlay2017-01-171-0/+1
|
* Merge branch 'master' into devDan Finlay2017-01-171-0/+2
|\
| * add to CHANGELOGFrankie2017-01-111-0/+1
| |
| * make CHANGELOG more human readableFrankie2016-12-211-1/+1
| |
| * Add to CHANGELOG.mdFrances Pangilinan2016-12-211-0/+1
| |
* | add to CHANGELOGFrankie2017-01-151-0/+1
| |
* | Add to CHANGELOGFrankie2017-01-121-0/+1
| |
* | changelog - add note on rpc overrideskumavis2017-01-111-0/+2
| |
* | Bump changelogDan Finlay2017-01-111-0/+1
| |
* | Merge branch 'dev' into network-indicator-refactorKevin Serrano2017-01-061-0/+2
|\ \
| * \ Merge branch 'dev' into fixTxManagerDan Finlay2017-01-061-0/+1
| |\ \
| | * | Bump changelogDan Finlay2017-01-051-0/+1
| | | |
| * | | Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into ↵Frankie2017-01-051-0/+1
| |\ \ \ | | |/ / | |/| | | | | | TxManager
| | * | Bump changelogDan Finlay2017-01-031-0/+1
| | | |
* | | | Changelog.Kevin Serrano2017-01-051-0/+2
|/ / /
* | | Changelog.Kevin Serrano2017-01-041-1/+1
| | |
* | | Changelog.Kevin Serrano2017-01-041-0/+1
|/ /
* | Merge branch 'dev' into TxManagerFrankie2016-12-221-0/+16
|\ \
| * | Add to changelog.Kevin Serrano2016-12-211-0/+1
| | |
| * | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-211-0/+2
| |\ \ | | | | | | | | Version 2.14.1
| | * | Version 2.14.12.14.1Dan Finlay2016-12-211-0/+2
| | |/
| * | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-201-0/+1
| |\ \ | | | | | | | | I900 forgot password flow
| | * | Add to changelog.Kevin Serrano2016-12-201-0/+1
| | | |
| * | | Merged master into devDan Finlay2016-12-201-0/+11
| |\ \ \ | | |/ / | |/| / | | |/
| | * changelog - add whitespacekumavis2016-12-201-0/+1
| | |
| | * changelog - inf reload detection hotfixkumavis2016-12-201-3/+5
| | |
| | * changelog - add note on inf reload detection hotfixkumavis2016-12-201-1/+1
| | |
| | * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| | * Bump changelog for removing mordenDan Finlay2016-12-161-0/+1
| | |
| | * deps - bump provider-engine for bug fixkumavis2016-12-131-0/+1
| | |
| | * changelog - "fix reload detection"kumavis2016-12-081-0/+2
| | |
| | * Version 2.13.112.13.11Dan Finlay2016-11-241-0/+2
| | |
* | | add to CHANGELOG.mdFrances Pangilinan2016-12-151-0/+1
|/ /
* | Merge branch 'master' into devDan Finlay2016-11-241-0/+11
|\|
| * changelog - add sync rpc eth_uninstallFilter notekumavis2016-11-241-0/+2
| |
| * Version 2.13.102.13.10Dan Finlay2016-11-231-2/+6
| |
| * Merge branch 'master' into new-faucetDan Finlay2016-11-231-0/+2
| |\
| | * Bump changelogDan Finlay2016-11-221-0/+2
| | |
| * | Add to changelog.Kevin Serrano2016-11-231-0/+1
| |/
| * Version 2.13.92.13.9Dan Finlay2016-11-221-0/+2
| |
* | Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-231-0/+1
| |
* | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-0/+1
| |
* | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-0/+1
|\ \ | |/ |/| Fix custom provider menu item
| * Fix custom provider menu itemDan Finlay2016-11-221-0/+1
| | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* | Begin adding Ropsten supportDan Finlay2016-11-221-0/+1
|/ | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* Increment tx ids to avoid collisionsDan Finlay2016-11-181-0/+2
| | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
* Version 2.13.82.13.8Dan Finlay2016-11-171-1/+4
|
* Add to changelog.Kevin Serrano2016-11-151-0/+1
|
* changelog - updatekumavis2016-11-111-0/+1
|
* Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-101-0/+1
|
* Version 2.13.7Dan Finlay2016-11-091-0/+2
|
* Adjust gas buffer to be 20% over estimateDan Finlay2016-11-091-1/+1
|
* Increase gas bufferDan Finlay2016-11-091-1/+2
| | | | Fixes #795
* Fix gas price bufferingDan Finlay2016-11-081-0/+1
| | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time.
* Fix github link on info pageDan Finlay2016-11-011-0/+2
|
* Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-271-0/+2
|\
| * Version 2.13.6Dan Finlay2016-10-271-0/+2
| |
* | Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-271-0/+4
|\|
| * Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-0/+2
| |\
| | * Merge branch 'master' into 761-FixCustomMordenIndicationDan Finlay2016-10-271-0/+1
| | |\
| | * | Bump changelogDan Finlay2016-10-261-0/+2
| | | |
| * | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix delegate call analysisDan Finlay2016-10-261-0/+1
| | |/ | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
| * / Rename wallet to accountDan Finlay2016-10-261-0/+1
| |/ | | | | | | Fixes #762
* / Update web3.js versionDan Finlay2016-10-261-0/+1
|/
* Fix CHANGELOGFrankie2016-10-201-0/+1
|
* Merge branch 'master' into i#741Frankie2016-10-201-0/+4
|\
| * Fix changelog dateDan Finlay2016-10-191-1/+1
| |
| * Version 2.13.5v2.13.5Dan Finlay2016-10-191-0/+2
| |
| * Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-191-0/+2
| | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746.
* | Add unit test for isHex and add to CHANGELOG.mdFrankie2016-10-201-0/+1
|/
* Increase gas estimate by 100000 weiDan Finlay2016-10-181-0/+2
| | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738.
* Version 2.13.4Dan Finlay2016-10-181-1/+3
|
* Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-181-0/+1
|\
| * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-121-0/+5
| |\
| * | Add to CHANGELOGFrankie2016-10-111-0/+2
| | |
* | | Bump changelog.Kevin Serrano2016-10-161-0/+2
| |/ |/|
* | Merge branch 'master' into i721-ScrollAccountListDan Finlay2016-10-121-0/+4
|\ \
| * | Modify changelog.Kevin Serrano2016-10-071-0/+1
| | |
| * | Merge branch 'master' into tosKevin Serrano2016-10-061-0/+3
| |\|
| * | Add to changelog.Kevin Serrano2016-10-051-0/+3
| | |
* | | Bump changelogDan Finlay2016-10-121-0/+1
| |/ |/|
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3kumavis2016-10-051-0/+2
|\|
| * Merge branch 'master' into SmallerCopiedButtonFrankie2016-10-051-0/+1
| |\
| * | Bump changelogDan Finlay2016-10-051-0/+1
| | |
| * | Make seed word confirmation button font smallerDan Finlay2016-10-051-0/+2
| | | | | | | | | | | | To avoid formatting glitches on some machines.
* | | Version 2.13.3Dan Finlay2016-10-051-0/+4
| |/ |/| | | | | Bumps provider-engine to fix log query filtering bug.
* | Removed hex prefix from private key exportDan Finlay2016-10-051-0/+1
|/ | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687
* Version 2.13.2Dan Finlay2016-10-051-0/+3
|
* Improve popup behavior for parity errorsDan Finlay2016-10-041-0/+1
| | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code.
* Add to CHANGELOGFrankie2016-10-011-0/+2
|
* Version 2.13.12.13.1Dan Finlay2016-09-231-1/+5
|
* Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-221-0/+3
|\
| * Version 2.13.0Dan Finlay2016-09-191-1/+3
| |
| * Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+1
| |
* | Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-161-0/+2
|\|
| * Fix CHANGELOG.md and restructure onClick eventsFrankie2016-09-161-1/+1
| |
| * Merge branch 'master' into tx-vizFrankie2016-09-161-0/+1
| |\
| * | Add to CHANGELOG.mdFrankie2016-09-161-0/+3
| | |
* | | Show loading indication when selecting ShapeShiftDan Finlay2016-09-161-0/+2
| |/ |/|
* | bump changelogkumavis2016-09-161-0/+1
|/
* Version 2.12.12.12.1Dan Finlay2016-09-151-1/+3
|
* Merge branch 'master' into i#626Frankie2016-09-151-1/+4
|\
| * Version 2.11.2Dan Finlay2016-09-151-1/+4
| |
* | Add to CHANGELOG.mdFrankie2016-09-151-0/+3
|/
* Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2016-09-141-0/+1
|\ | | | | | | into i646-ClosePopupBug
| * Merge branch 'master' into qrCodeFrankie2016-09-141-0/+4
| |\
| * \ Merge branch 'master' into qrCodeFrankie2016-09-131-0/+2
| |\ \
| * | | Add to CHANGELOG.mdFrankie2016-09-131-0/+1
| | | |
* | | | Bump changelogDan Finlay2016-09-141-0/+3
| |_|/ |/| |
* | | Fix cache clearing reference for OperaDan Finlay2016-09-131-0/+4
| |/ |/| | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
* | Version 2.11.0Dan Finlay2016-09-131-0/+2
|/
* Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-131-1/+0
|
* Bump changelogDan Finlay2016-09-101-0/+1
|
* Update changelogKevin Serrano2016-09-101-1/+1
|
* Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ↵Kevin Serrano2016-09-101-0/+1
|\ | | | | | | into i610-InitOneWalletOnly
| * Bump changelogDan Finlay2016-09-091-0/+1
| |
* | Show loading indication during unlocking.Dan Finlay2016-09-091-0/+1
|/
* Merge branch 'i#589pendingTxsIssue' of ↵Frankie2016-09-091-0/+1
|\ | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
| * Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-091-0/+1
| |\
| | * Bump changelogDan Finlay2016-09-091-0/+1
| | |
* | | Fix wording in changelog and bugFrankie2016-09-091-1/+1
|/ /
* / Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-091-0/+1
|/
* Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-071-0/+3
|\
| * Bump changelogDan Finlay2016-09-071-0/+1
| |
| * Update changelog and merge master.Kevin Serrano2016-09-071-0/+1
| |
| * Add to changelog.Kevin Serrano2016-09-071-0/+2
| |
* | Bump changelogDan Finlay2016-09-071-0/+2
|/
* Merge branch 'master' into livereloadKevin Serrano2016-09-031-0/+4
|\
| * Version 2.10.2kumavis2016-09-031-0/+4
| |
* | Merge branch 'master' into livereloadKevin Serrano2016-09-031-0/+3
|\|
| * Version 2.10.1kumavis2016-09-031-0/+3
| |