Go to file
idradm cae634dfb1 Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor
# Conflicts:
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/Nodes/NodeGroup.php
#	extensions/wikia/PortableInfobox/tests/ParserNodesTest.php
2015-06-15 14:57:57 +02:00
controllers Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor 2015-06-15 14:57:57 +02:00
services Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor 2015-06-15 14:57:57 +02:00
styles Merge pull request #7488 from Wikia/DAT-2857 2015-06-12 15:23:44 +02:00
templates Merge pull request #7488 from Wikia/DAT-2857 2015-06-12 15:23:44 +02:00
tests Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor 2015-06-15 14:57:57 +02:00
crowdin.conf add missing new line 2015-05-06 14:56:40 +02:00
PortableInfobox.i18n.php xml markup parse error handling 2015-05-08 13:51:31 +02:00
PortableInfobox.setup.php Merge remote-tracking branch 'origin/dev' into DAT-2875-refactor 2015-06-15 14:57:57 +02:00
PortableInfoboxHooks.class.php fix issues with default infobox styles on monobook 2015-05-18 15:56:45 +02:00