diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-01-31 19:33:39 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-01-31 19:33:39 +0200 |
| commit | e774f71205e9055f6a329ce7b3748450109591ef (patch) | |
| tree | 388f91600d5bb47f51f086022b620c716dbd6c7a | |
| parent | b2986ca28975ef8b199fd2558db70dfa1729b522 (diff) | |
| parent | 1b11123797a8da92e478ea257cd24ebadf084a24 (diff) | |
| download | wekan-e774f71205e9055f6a329ce7b3748450109591ef.tar.gz wekan-e774f71205e9055f6a329ce7b3748450109591ef.tar.bz2 wekan-e774f71205e9055f6a329ce7b3748450109591ef.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | .meteor/versions | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
5 files changed, 14 insertions, 6 deletions
diff --git a/.meteor/versions b/.meteor/versions index 4fdbf591..db616c7e 100644 --- a/.meteor/versions +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 73a092b1..de9ec68f 100644 --- a/CHANGELOG.md +++ b/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: diff --git a/Stackerfile.yml b/Stackerfile.yml index 51a90b99..f0f61101 100644 --- a/Stackerfile.yml +++ b/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 diff --git a/package.json b/package.json index ef6a30e4..5209c96b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.11.0", + "version": "v2.12.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0e9e4d75..d8d80938 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 = 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, |