Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad84a3fe2827eea0bc2ac2d0a8e6ecdf7e6ebf7c https://github.com/phpmyadmin/phpmyadmin/commit/ad84a3fe2827eea0bc2ac2d0a8e6... Author: Nisarg Jhaveri <nisargjhaveri@gmail.com> Date: 2015-02-04 (Wed, 04 Feb 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Clarify the "Inline" link, rfe_1600 Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com> Commit: b83cdcd4ae312ca8e5a192cf176bb76af824f3bd https://github.com/phpmyadmin/phpmyadmin/commit/b83cdcd4ae312ca8e5a192cf176b... Author: Marc Delisle <marc@infomarc.info> Date: 2015-02-04 (Wed, 04 Feb 2015) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a9729f46cba3...b83cdcd4ae31