Universal-Omega/PortableInfobox
1
0
Fork 0
mirror of https://github.com/Universal-Omega/PortableInfobox.git synced 2024-11-15 11:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Mirror of https://github.com/Universal-Omega/PortableInfobox
5 commits 8 branches 4 tags 31 MiB
PHP 85.3%
JavaScript 7.9%
Less 4.4%
Handlebars 2.4%
Go to file
nAndy 0fee93ec6d ADEN-1960 manually merged origin/dev 
And resolved conflicts in:
* AdEngine/js/AdLogicPageDimensions.js,
* AdEngine/js/provider/directGpt.js,
* AdEngine/js/run/desktop.run.js.
2015-05-26 11:21:46 +00:00
controllers ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
services ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
styles ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
templates ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
tests ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
crowdin.conf ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
PortableInfobox.i18n.php ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
PortableInfobox.setup.php ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00
PortableInfoboxHooks.class.php ADEN-1960 manually merged origin/dev 2015-05-26 11:21:46 +00:00