mistic100 9cff7f1781 Merged revision(s) r26863 from trunk:
bug 3024: Warning: array_merge(): Argument 1 is not an array on template.class.php

git-svn-id: http://piwigo.org/svn/branches/2.6@26864 68402e56-0260-453c-a942-63ccdbb3a9ee
2014-01-18 15:12:44 +00:00
2014-01-05 00:19:25 +00:00
2014-01-17 22:20:56 +00:00
Languages
PHP 74.3%
HTML 9.7%
JavaScript 7.3%
Smarty 4.8%
CSS 3.3%
Other 0.5%