Go to file
idradm 545880a804 Merge remote-tracking branch 'origin/dev' into DAT-2792
# Conflicts:
#	includes/wikia/api/InfoboxApiController.class.php
2015-06-18 13:03:51 +02:00
controllers DAT-2875 check for empty nodes updated 2015-06-16 13:45:27 +02:00
services Merge remote-tracking branch 'origin/dev' into DAT-2792 2015-06-18 13:03:51 +02:00
styles Merge pull request #7545 from Wikia/DAT-2902 2015-06-18 12:46:29 +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-2792 2015-06-18 13:03:51 +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-2792 2015-06-18 13:03:51 +02:00
PortableInfoboxHooks.class.php PR fix 2015-06-09 14:33:49 +02:00