Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ea2dd3c1713156b97cc2e2046af120f70fe3935b https://github.com/phpmyadmin/phpmyadmin/commit/ea2dd3c1713156b97cc2e2046af1... Author: Marc Delisle marc@infomarc.info 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 marc@infomarc.info

Commit: 1347aa60e36f6d8f5860b7531ec24bc526d9b24b https://github.com/phpmyadmin/phpmyadmin/commit/1347aa60e36f6d8f5860b7531ec2... Author: Marc Delisle marc@infomarc.info 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 marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/27b9e16dc6b3...1347aa60e36f