Merge remote-tracking branch 'upstream/master'

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.11.5rc1
+current_version = 0.11.5
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

CHANGELOG.md

@@ -16,10 +16,8 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Fixed
-  * Eliminated instance of costs being double fetched
+  *
-  * Fixed issue preventing file re-download
+  *
-  * Fixed race condition that could prevent file playbac
-  * Fixed issue with batch actions and thunk
 
 ### Deprecated
   *
@@ -29,6 +27,16 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
   *
 
+## [0.11.5] - 2017-05-28
+
+### Fixed
+ * Eliminated instance of costs being double fetched
+ * Fixed issue preventing file re-download
+ * Fixed race condition that could prevent file playbac
+ * Fixed issue with batch actions and thunk
+
+
+
 ## [0.11.4] - 2017-05-26
 
 ### Added

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.11.5rc1",
+  "version": "0.11.5",
   "main": "main.js",
   "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
   "author": {

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lbry-web-ui",
-  "version": "0.11.5rc1",
+  "version": "0.11.5",
   "description": "LBRY UI",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",