Merge pull request #1472 from uProxy/dev

iislucas · iislucas · commit 55515485d7df · 2015-05-04T14:28:26.000-04:00
Merge dev to make our release candidate.
diff --git a/src/chrome/app/manifest.json b/src/chrome/app/manifest.json
@@ -3,7 +3,7 @@
   "name": "__MSG_appName__",
   "description": "__MSG_appDescription__",
   "minimum_chrome_version": "41.0.2272.63",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "default_locale": "en",
   "icons": {
       "128": "icons/128_online.png"
diff --git a/src/chrome/extension/manifest.json b/src/chrome/extension/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "__MSG_extName__",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "manifest_version": 2,
   "description": "__MSG_extDescription__",
   "minimum_chrome_version": "41.0.2272.63",
diff --git a/src/firefox/package.json b/src/firefox/package.json
@@ -5,7 +5,7 @@
   "description": "This is the alpha version of uProxy.",
   "author": "uProxy Team <info@uproxy.org>",
   "license": "Apache 2.0",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "permissions": {
     "private-browsing": true
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "__MSG_extName__",`
`3`		`- "version": "0.8.4",`
	`3`	`+ "version": "0.8.5",`
`4`	`4`	`"manifest_version": 2,`
`5`	`5`	`"description": "__MSG_extDescription__",`
`6`	`6`	`"minimum_chrome_version": "41.0.2272.63",`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"description": "This is the alpha version of uProxy.",`
`6`	`6`	`"author": "uProxy Team <info@uproxy.org>",`
`7`	`7`	`"license": "Apache 2.0",`
`8`		`- "version": "0.8.4",`
	`8`	`+ "version": "0.8.5",`
`9`	`9`	`"permissions": {`
`10`	`10`	`"private-browsing": true`
`11`	`11`	`}`