Merge branch 'edge' into meteor-1.8

5 files changed, 16 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9f1e536..194ad8c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v2.40 2019-03-06 Wekan erlease
+
+- Part 2: [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
+  [manifest](https://github.com/wekan/wekan/issues/2168) and
+  [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
 # v2.39 2019-03-06 Wekan release
 
 This release fixes the following bugs:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index c09b6bf7..eb492c54 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.39.0"
+appVersion: "v2.40.0"
 files:
   userUploads:
     - README.md
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index c0b66e94..3be676a3 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -7,10 +7,10 @@ head
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" href="wekan-favicon.png")
-  link(rel="apple-touch-icon" href="wekan-favicon.png")
-  link(rel="mask-icon" href="wekan-150.svg")
-  link(rel="manifest" href="wekan-manifest.json")
+  link(rel="shortcut icon" href="/wekan-favicon.png")
+  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-150.svg")
+  link(rel="manifest" href="/wekan-manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
diff --git a/package.json b/package.json
index 7ad6e4e1..893a6a2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.39.0",
+  "version": "v2.40.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 36091f6e..302039ba 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 241,
+    appVersion = 242,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.39.0~2019-03-06"),
+    appMarketingVersion = (defaultText = "2.40.0~2019-03-06"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,