Go to file
jacek bdd107445b Merge branch 'portable_infobox_mvp' into DAT-2762
# Conflicts:
#	extensions/wikia/PortableInfobox/tests/XmlParserTest.php
2015-05-07 15:29:44 +02:00
controllers Merge branch 'portable_infobox_mvp' into DAT-2738 2015-05-07 14:58:52 +02:00
services Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-07 15:29:44 +02:00
styles Merge branch 'dev' into DAT-2763 2015-05-06 17:12:00 +02:00
templates Merge branch 'portable_infobox_mvp' into DAT-2738 2015-05-07 14:58:52 +02:00
tests Merge branch 'portable_infobox_mvp' into DAT-2762 2015-05-07 15:29:44 +02:00
crowdin.conf add missing new line 2015-05-06 14:56:40 +02:00
PortableInfobox.i18n.php add missing new line 2015-05-06 14:56:19 +02:00
PortableInfobox.setup.php Merge branch 'portable_infobox_mvp' into DAT-2745 2015-05-07 14:54:23 +02:00
PortableInfoboxHooks.class.php Merge branch 'portable_infobox_mvp' into DAT-2738 2015-05-07 14:58:52 +02:00