v1.1.0

Prepare changelog for v1.1.0
Merge branch 'develop' into release-v1.1.0
2019-05-07 15:23:32 +01:00 · 2019-05-07 15:23:32 +01:00 · 2019-04-30 11:50:24 +01:00 · 2019-04-30 11:48:38 +01:00
3 changed files with 11 additions and 5 deletions
@@ -1,3 +1,9 @@
+Changes in [1.1.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.1.0) (2019-05-07)
+================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v1.1.0-rc.1...v1.1.0)
+
+ * No Changes since rc.1
+
 Changes in [1.1.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.1.0-rc.1) (2019-04-30)
 ==========================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-js-sdk/compare/v1.0.4...v1.1.0-rc.1)
@@ -1,6 +1,6 @@
 {
  "name": "matrix-js-sdk",
-  "version": "1.1.0-rc.1",
+  "version": "1.1.0",
  "description": "Matrix Client-Server SDK for Javascript",
  "main": "index.js",
  "scripts": {
@@ -172,10 +172,10 @@ git commit package.json $pkglock -m "$tag"


 # figure out if we should be signing this release
-signing_id=releases@riot.im
-#if [ -f release_config.yaml ]; then
-    #signing_id=`cat release_config.yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['signing_id']"`
-#fi
+signing_id=
+if [ -f release_config.yaml ]; then
+    signing_id=`cat release_config.yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)['signing_id']"`
+fi


 # If there is a 'dist' script in the package.json,
Author	SHA1	Message	Date
David Baker	c1956d3f05	v1.1.0	2019-05-07 15:23:32 +01:00
David Baker	56316dc5d9	Prepare changelog for v1.1.0	2019-05-07 15:23:32 +01:00
David Baker	0bb9c56e94	Merge branch 'develop' into release-v1.1.0	2019-04-30 11:50:24 +01:00
David Baker	821f1c876b	Undo unintentional commenting	2019-04-30 11:48:38 +01:00