Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9f186aae7d1904b8721964db82ce6a7c940b00e6
https://github.com/phpmyadmin/phpmyadmin/commit/9f186aae7d1904b8721964db82ce6a7c940b00e6
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M libraries/Config.class.php
Log Message:
-----------
ini_set: Use string for param 2
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: e98a9a7bdb4ea1fa80c286c7868ef0535d4a685e
https://github.com/phpmyadmin/phpmyadmin/commit/e98a9a7bdb4ea1fa80c286c7868ef0535d4a685e
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M libraries/Config.class.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/737df91c370d...e98a9a7bdb4e------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
