Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 179285bb616b8eaa3dda5a625a572843aba1d9e6
      
https://github.com/phpmyadmin/phpmyadmin/commit/179285bb616b8eaa3dda5a625a572843aba1d9e6
  Author: Smita Kumari <kumarismit...@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 <kumarismit...@gmail.com>


  Commit: fd6e7cf4e14612d88242cccb7750f1d495bcb19e
      
https://github.com/phpmyadmin/phpmyadmin/commit/fd6e7cf4e14612d88242cccb7750f1d495bcb19e
  Author: Smita Kumari <kumarismit...@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 <kumarismit...@gmail.com>


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/45d234f6384a...fd6e7cf4e146
------------------------------------------------------------------------------
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to