[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ca189a: bug #3570786 [edit] Datepicker for date and dateti...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ca189ad90d56e003b5492839b0ad6e3a552a587a
      https://github.com/phpmyadmin/phpmyadmin/commit/ca189ad90d56e003b5492839b0ad6e3a552a587a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/tbl_change.js

  Log Message:
  -----------
  bug #3570786 [edit] Datepicker for date and datetime fields is broken


  Commit: 7fa908e45509ab53cfaab17f36749e2f9d1eb188
      https://github.com/phpmyadmin/phpmyadmin/commit/7fa908e45509ab53cfaab17f36749e2f9d1eb188
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/tbl_change.js

  Log Message:
  -----------
  Merge branch 'QA_3_5'

Conflicts:
	js/functions.js


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aefb544591d5...7fa908e45509