Merge dev into master

Author: github-actions[bot]

.github/workflows/release.yml

@@ -73,12 +73,16 @@ jobs:
       run: ./.github/scripts/publish_preflight_check.sh
 
     - name: Merge to master
-      uses: devmasx/merge-branch@b57c127024eb70aef25b76a54e586638d17ee085
+      uses: actions/[email protected]
       with:
-        type: now
-        target_branch: master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+            github.repos.merge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              base: 'master',
+              head: 'dev'
+            })
 
     # We pull this action from a custom fork of a contributor until
     # https://github.com/actions/create-release/pull/32 is merged. Also note that v1 of
@@ -96,4 +100,4 @@ jobs:
         prerelease: false
 
     - name: Post to Twitter
-      run: Sending Tweet
+      run: echo Sending Tweet

release_demo/__about__.py

@@ -1,2 +1,2 @@
 # Example version file
-__version__ = '0.0.20'
+__version__ = '0.0.25'