idradm 8b1289b291 Merge branch 'dev' into XW-2415 ... # Conflicts: # extensions/VisualEditor/wikia/VisualEditor.i18n.php # extensions/wikia/PortableInfobox/PortableInfobox.setup.php # extensions/wikia/PortableInfobox/tests/PortableInfoboxParserTagControllerTest.php # extensions/wikia/PortableInfobox/tests/PortableInfoboxRenderServiceTest.php		2017-01-05 12:37:59 +01:00
..
Nodes	Merge branch 'dev' into XW-2415	2017-01-05 12:37:59 +01:00
DummyParser.php	DAT-2861 add images to parser output on resolving, use same parser instance for all parsing	2015-06-01 15:37:56 +02:00
ExternalParser.php	DAT-3402 move links placeholder replacement after markers are resolved	2015-10-27 14:09:42 +01:00
MediaWikiParserService.php	XW-2278 fix wikitext lists after variables were replaced	2016-11-14 11:24:44 +01:00
SimpleParser.php	DAT-3402 move links placeholder replacement after markers are resolved	2015-10-27 14:09:42 +01:00
XmlParser.php	DAT-3197 wrap content tags contents in CDATA before parsing	2015-09-07 12:22:56 +02:00