Merlijn van Deen has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into HEAD ......................................................................
Merge remote-tracking branch 'origin/master' into HEAD Conflicts: .gitignore python2/httplib2/cacerts.txt python3/httplib2/cacerts.txt setup.py Change-Id: I3b1e2fc062ddb6c57b7a9d355b4e1f6832cacc38 --- M .gitignore M python2/httplib2/cacerts.txt M python3/httplib2/cacerts.txt M setup.py 4 files changed, 277 insertions(+), 6,636 deletions(-) Approvals: John Vandenberg: Verified; Looks good to me, approved Objections: Merlijn van Deen: There's a problem with this change, please improve -- To view, visit https://gerrit.wikimedia.org/r/137369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b1e2fc062ddb6c57b7a9d355b4e1f6832cacc38 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/externals/httplib2 Gerrit-Branch: master Gerrit-Owner: Pywikipedia Conversion Bot <valhall...@gmail.com> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits