Merge branch 'edge' into meteor-1.8

.meteor/versions

@@ -146,8 +146,8 @@ reload@1.2.0
 retry@1.1.0
 routepolicy@1.1.0
 rzymek:fullcalendar@3.8.0
-salleman:accounts-oidc@1.0.9
-salleman:oidc@1.0.9
+salleman:accounts-oidc@1.0.10
+salleman:oidc@1.0.10
 service-configuration@1.0.11
 session@1.2.0
 sha@1.0.9

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v2.12 2019-01-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Bumped the salleman oidc packages versions to include an upstream bug fix](https://github.com/wekan/wekan/commit/361faa6646556de68ad78dc90d9eb9f78956ce0f).
+
+Thanks to GitHub user danpatdav for contributions.
+
 # v2.11 2019-01-31 Wekan release
 
 This release fixes the following bugs:

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.11.0"
+appVersion: "v2.12.0"
 files:
   userUploads:
     - README.md

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.11.0",
+  "version": "v2.12.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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 = 213,
+    appVersion = 214,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.11.0~2019-01-31"),
+    appMarketingVersion = (defaultText = "2.12.0~2019-01-31"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,