diff --git a/.npmrc b/.npmrc index 2deb0beeac8..63ec3d41ce5 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,5 @@ runtime = electron -target = 2.0.11 +target = 2.0.12 target_arch = x64 -brave_electron_version = 2.0.11 +brave_electron_version = 2.0.12 disturl = http://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa63d92506..aaa6d348577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Linux sandbox added. ([#874](https://github.com/brave/browser-laptop/issues/874)) - Window renderer processes no longer include Node, content renderer never did in Brave. ([#6454](https://github.com/brave/browser-laptop/issues/6454)) - URL bar autocomplete no longer flashes when you enter text. ([#6644](https://github.com/brave/browser-laptop/issues/6644)) -- Muon updated to 2.0.11. +- Muon updated to 2.0.12. - Chromium updated to 54.0.2840.100. ## [0.12.15](https://github.com/brave/browser-laptop/releases/v0.12.15dev) diff --git a/tools/cibuild.py b/tools/cibuild.py index 4fa854990b2..7068702fe31 100755 --- a/tools/cibuild.py +++ b/tools/cibuild.py @@ -5,8 +5,8 @@ import sys import os.path -BRAVE_ELECTRON = '2.0.11' -UPSTREAM_ELECTRON = '2.0.11' +BRAVE_ELECTRON = '2.0.12' +UPSTREAM_ELECTRON = '2.0.12' SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64' os.environ['npm_config_arch'] = TARGET_ARCH