Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ea2dd3c1713156b97cc2e2046af120f70fe3935b
https://github.com/phpmyadmin/phpmyadmin/commit/ea2dd3c1713156b97cc2e2046af120f70fe3935b
Author: Marc Delisle <[email protected]>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M ChangeLog
M libraries/Config.class.php
M test/classes/PMA_Theme_test.php
Log Message:
-----------
bug #4361 Can't change font size (when config.inc.php not present)
Signed-off-by: Marc Delisle <[email protected]>
Commit: 1347aa60e36f6d8f5860b7531ec24bc526d9b24b
https://github.com/phpmyadmin/phpmyadmin/commit/1347aa60e36f6d8f5860b7531ec24bc526d9b24b
Author: Marc Delisle <[email protected]>
Date: 2014-09-21 (Sun, 21 Sep 2014)
Changed paths:
M ChangeLog
M libraries/Config.class.php
M test/classes/PMA_Theme_test.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <[email protected]>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/27b9e16dc6b3...1347aa60e36f------------------------------------------------------------------------------
Slashdot TV. Video for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
