30 Jun
2012
30 Jun
'12
6:17 a.m.
Hi
Dne Fri, 29 Jun 2012 16:22:38 +0200 Michal Čihař michal@cihar.com napsal(a):
Hi
Dne Fri, 29 Jun 2012 16:49:21 +0300 Alex Marin alex.ukf@gmail.com napsal(a):
After I merged master and pushed, I can't seem to be able to make a pull request with only these two commits. Is it alright if I also include other commits (not mine) in a pull request, or is it easier for you to merge my branch [3]?
Branch merged.
But that results in another error:
PHP Fatal error: Class name must be a valid object or a string in libraries/display_import_ajax.lib.php on line 124 PHP Stack trace: PHP 1. {main}() import_status.php:0 PHP 2. PMA_importAjaxStatus() import_status.php:96
--
Michal Čihař | http://cihar.com | http://phpmyadmin.cz