Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae
https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fce…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M ChangeLog
M js/console.js
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 44060b77c9d1b5ff47ae9ed17712cccedd4b8a60
https://github.com/phpmyadmin/phpmyadmin/commit/44060b77c9d1b5ff47ae9ed1771…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2014-12-22 (Mon, 22 Dec 2014)
Changed paths:
M ChangeLog
M js/console.js
Log Message:
-----------
Merge branch 'QA_4_3'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/3621900b96c2...44060b77c9d1