Merge branch 'master' into develop

* master: bump version to 0.10.2
10 years ago · f64d76d4c3
parent 5a909156d1 99403fed70
commit f64d76d4c3
2 changed files with 2 additions and 2 deletions
--- a/.sandstorm/sandstorm-pkgdef.capnp
+++ b/.sandstorm/sandstorm-pkgdef.capnp
@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (

    appVersion = 6,  # Increment this for every release.

-    appMarketingVersion = (defaultText = "0.10.1"),
+    appMarketingVersion = (defaultText = "0.10.2"),
    # Human-readable representation of appVersion. Should match the way you
    # identify versions of your app in documentation and marketing.

--- a/packages/rocketchat-lib/rocketchat.info
+++ b/packages/rocketchat-lib/rocketchat.info
@ -1,3 +1,3 @@
 {
-	"version": "0.10.1"
+	"version": "0.10.2"
 }