[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 179285: bug fix #4545
Smita Kumari
kumarismita62 at gmail.com
Tue Sep 30 21:42:38 CEST 2014
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 179285bb616b8eaa3dda5a625a572843aba1d9e6
https://github.com/phpmyadmin/phpmyadmin/commit/179285bb616b8eaa3dda5a625a572843aba1d9e6
Author: Smita Kumari <kumarismita62 at gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths:
M ChangeLog
M js/functions.js
M js/navigation.js
Log Message:
-----------
bug fix #4545
Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>
Commit: fd6e7cf4e14612d88242cccb7750f1d495bcb19e
https://github.com/phpmyadmin/phpmyadmin/commit/fd6e7cf4e14612d88242cccb7750f1d495bcb19e
Author: Smita Kumari <kumarismita62 at gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
Changed paths:
M ChangeLog
M js/functions.js
M js/navigation.js
Log Message:
-----------
resolve merge conflict
Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45d234f6384a...fd6e7cf4e146
More information about the Git
mailing list