Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/359189 )
Change subject: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/translatewiki into HEAD ...................................................................... Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/translatewiki into HEAD Change-Id: Ibb44c4e67ff12ea52ae08735e8081c8f8b65fe11 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/89/359189/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 6da1165..090918c 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -560,11 +560,7 @@ Capiunto -<<<<<<< HEAD (e50c55 Remove Cards from translatewiki) # Cards // Disable per T167452 -======= -# Cards // Empty https://gerrit.wikimedia.org/r/#/c/357519/ ->>>>>>> BRANCH (39bd18 [Core] Add key to ignore) Cargo magicfile = Cargo/Cargo.i18n.magic.php -- To view, visit https://gerrit.wikimedia.org/r/359189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb44c4e67ff12ea52ae08735e8081c8f8b65fe11 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
