Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: bb982053899718f94471ce3f5728ab963c11dda3
      
https://github.com/phpmyadmin/phpmyadmin/commit/bb982053899718f94471ce3f5728ab963c11dda3
  Author: Marc Delisle <[email protected]>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M js/db_structure.js

  Log Message:
  -----------
  Fix merge conflicts for security patch



------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to