brave/electron 1.4.28 and browser-laptop 0.12.12

brave · Dec 4, 2016 · c252087 · c252087
1 parent 99610ad
commit c252087
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1,5 +1,5 @@
 runtime = electron
 target = 1.4.0
 target_arch = x64
-brave_electron_version = 1.4.27
+brave_electron_version = 1.4.28
 disturl = https://atom.io/download/atom-shell
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.12.12](https://github.com/brave/browser-laptop/releases/v0.12.12dev)
+- Muon update (Brave's Electron fork)
+
 ## [0.12.11](https://github.com/brave/browser-laptop/releases/v0.12.11dev)
 - Muon update (Brave's Electron fork)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "brave",
-  "version": "0.12.11",
+  "version": "0.12.12",
   "description": "Brave laptop and desktop browser",
   "main": "./app/index.js",
   "config": {

diff --git a/tools/cibuild.py b/tools/cibuild.py
@@ -5,7 +5,7 @@
 import sys
 import os.path
 
-BRAVE_ELECTRON = '1.4.27'
+BRAVE_ELECTRON = '1.4.28'
 UPSTREAM_ELECTRON = '1.4.0'
 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'