Go to file
idradm 3e8a665242 Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
#	extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
2015-06-19 14:43:40 +02:00
controllers Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
services Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
styles Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
templates Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
tests Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
crowdin.conf add missing new line 2015-05-06 14:56:40 +02:00
PortableInfobox.i18n.php add more contenxt to translation massage description 2015-06-11 11:38:09 +02:00
PortableInfobox.setup.php Merge remote-tracking branch 'origin/dev' into DAT-2839 2015-06-19 14:43:40 +02:00
PortableInfoboxHooks.class.php PR fix 2015-06-09 14:33:49 +02:00