jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/935689 )
Change subject: Merge branch 'master' into stable ......................................................................
Merge branch 'master' into stable
Change-Id: Ibc8fa80ab75e0534c0c39752f03938321807645d --- M pywikibot/__metadata__.py 2 files changed, 213 insertions(+), 4 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index c003bf5..e6ff22a 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@
__name__ = 'pywikibot' -<<<<<<< HEAD (11f162 Update git submodules) -__version__ = '8.1.2' -======= __version__ = '8.2.0' ->>>>>>> BRANCH (aecc9c [8.2] Publish Pywikibot 8.2) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot@lists.wikimedia.org'