Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1de1cd6c8d5c0267259369b4c2c37b9249c630f8 https://github.com/phpmyadmin/phpmyadmin/commit/1de1cd6c8d5c0267259369b4c2c3... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-06-01 (Mon, 01 Jun 2015) Changed paths: M libraries/DatabaseInterface.class.php M libraries/dbi/DBIDummy.class.php Log Message: ----------- Identify MariaDB Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 055f434886c9e7a1982de7627b5b78bc11525721 https://github.com/phpmyadmin/phpmyadmin/commit/055f434886c9e7a1982de7627b5b... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-06-01 (Mon, 01 Jun 2015) Changed paths: M libraries/Types.class.php Log Message: ----------- Use PMA_MARIADB constant to identify MariaDB Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 8815a16c418a56c978e0950fb120de31688448bc https://github.com/phpmyadmin/phpmyadmin/commit/8815a16c418a56c978e0950fb120... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-06-01 (Mon, 01 Jun 2015) Changed paths: M po/fr.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d2ce53d4aec2...8815a16c418a