jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/942392 )

Change subject: Merge branch 'master' into stable ......................................................................

Merge branch 'master' into stable

Change-Id: Idab43d4f8d421e4b5af8bf1788cdd832fe0ce385 --- M .appveyor.yml M scripts/__init__.py 3 files changed, 38 insertions(+), 8 deletions(-)

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified

diff --git a/.appveyor.yml b/.appveyor.yml index 60a2155..dc65320 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,11 +1,7 @@ image: Visual Studio 2022 clone_depth: 50 skip_tags: true -<<<<<<< HEAD (fa129e Update git submodules) -version: 8.1.{build} -======= version: 8.3.{build} ->>>>>>> BRANCH (66562f [8.3.0] Publish Pywikibot 8.3) environment:

PYWIKIBOT_DIR: "%appdata%\Pywikibot" diff --git a/scripts/__init__.py b/scripts/__init__.py index 3f1d879..aa4c723 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -29,8 +29,4 @@ # # Distributed under the terms of the MIT license. # -<<<<<<< HEAD (fa129e Update git submodules) -__version__ = '8.1.0' -======= __version__ = '8.3.0' ->>>>>>> BRANCH (66562f [8.3.0] Publish Pywikibot 8.3)