From 945b72b990f6d3b011299661f92dff603746d200 Mon Sep 17 00:00:00 2001 From: Ernst Date: Sat, 13 Nov 2021 17:09:46 +0100 Subject: [PATCH 1/2] a few simple language fixes (README.md) (#9642) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fb0414e1..1dfb35bb 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@

Zigbee2MQTT 🌉 🐝

- Allows you to use your Zigbee devices without the vendors bridge or gateway. + Allows you to use your Zigbee devices without the vendor's bridge or gateway.

It bridges events and allows you to control your Zigbee devices via MQTT. In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. @@ -75,7 +75,7 @@ Zigbee2MQTT uses TypeScript (partially for now). Therefore after making changes ## Supported devices See [Supported devices](https://www.zigbee2mqtt.io/supported-devices) to check whether your device is supported. There is quite an extensive list, including devices from vendors like Xiaomi, Ikea, Philips, OSRAM and more. -If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easy, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html). +If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easily, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html). ## Support & help If you need assistance you can check [opened issues](https://github.com/Koenkk/zigbee2mqtt/issues). Feel free to help with Pull Requests when you were able to fix things or add new devices or just share the love on social media. From 91479fc0ec61f08bc9c6393381977a7195c04e64 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Thu, 18 Nov 2021 20:14:26 +0100 Subject: [PATCH 2/2] Enable auto merge for update_zhc/zh --- .github/workflows/update_zh.yml | 5 +++++ .github/workflows/update_zhc.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/update_zh.yml b/.github/workflows/update_zh.yml index 299a7093..b949586a 100644 --- a/.github/workflows/update_zh.yml +++ b/.github/workflows/update_zh.yml @@ -20,3 +20,8 @@ jobs: commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }} branch: "update_zh" title: Update zigbee-herdsman to ${{ github.event.client_payload.version }} + - uses: peter-evans/enable-pull-request-automerge@v1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash \ No newline at end of file diff --git a/.github/workflows/update_zhc.yml b/.github/workflows/update_zhc.yml index 2268831d..6e372041 100644 --- a/.github/workflows/update_zhc.yml +++ b/.github/workflows/update_zhc.yml @@ -20,3 +20,8 @@ jobs: commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} branch: "update_zhc" title: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} + - uses: peter-evans/enable-pull-request-automerge@v1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash \ No newline at end of file