Go to file
idradm 47adca6ea1 Restore "Merge pull request #12220 from Wikia/XW-2448"
This reverts commit 50d81602c84b9474e070d6c1a8e2995cd9b8d91b.

# Conflicts:
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2017-01-25 12:18:20 +01:00
controllers Merge branch 'dev' into XW-2415 2017-01-05 12:37:59 +01:00
js XW-2569 fix multiple header collapsing 2017-01-11 14:43:45 +01:00
maintenance DAT-3171 Adding a maintenance script to handle invalid titles 2015-08-31 16:29:58 +02:00
querypage (MAIN-6855) Make hasInfobox and filterInfoboxes private 2016-04-06 19:55:36 +10:00
services Restore "Merge pull request #12220 from Wikia/XW-2448" 2017-01-25 12:18:20 +01:00
styles Merge branch 'dev' of https://github.com/Wikia/app into XW-2591 2017-01-13 14:05:04 +01:00
templates Merge branch 'dev' into XW-2473 2017-01-13 16:18:53 +01:00
tests Restore "Merge pull request #12220 from Wikia/XW-2448" 2017-01-25 12:18:20 +01:00
crowdin.conf add missing new line 2015-05-06 14:56:40 +02:00
PortableInfobox.i18n.php XW-2444: fallback to default color instead of displaying error when wrong color is provided 2016-12-29 09:46:05 +01:00
PortableInfobox.setup.php Restore "Merge pull request #12220 from Wikia/XW-2448" 2017-01-25 12:18:20 +01:00
PortableInfoboxHooks.class.php Restore "Merge pull request #12220 from Wikia/XW-2448" 2017-01-25 12:18:20 +01:00