Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 47bda67e38aee09dc9d78c67eb993cc3532c45ec https://github.com/phpmyadmin/phpmyadmin/commit/47bda67e38aee09dc9d78c67eb99... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-07-07 (Tue, 07 Jul 2015) Changed paths: M ChangeLog M themes/original/css/common.css.php Log Message: ----------- bug #4976 Timepicker CSS issues in Original theme Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 4962b4606241a3a2141462b394664b4297f22ec5 https://github.com/phpmyadmin/phpmyadmin/commit/4962b4606241a3a2141462b39466... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-07-07 (Tue, 07 Jul 2015) Changed paths: M ChangeLog M themes/original/css/common.css.php Log Message: ----------- Merge branch 'QA_4_4' Conflicts: themes/original/css/common.css.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8f4e0fda0432...4962b4606241