Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189156
Change subject: Merge branch 'master' into HEAD
......................................................................
Merge branch 'master' into HEAD
Conflicts:
WikiEditor.php
modules/components/jquery.wikiEditor.toolbar.less
Change-Id: Ic843c7190a71ce5f6a2b40a32dd41cdf1fa13b6d
---
0 files changed, 0 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/56/189156/1
[Octopus merge; cannot be formatted as a diff.]
--
To view, visit https://gerrit.wikimedia.org/r/189156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic843c7190a71ce5f6a2b40a32dd41cdf1fa13b6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
