Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 50edafc0884aa15d0a1aa178089ac6a1ad2eb18a
      
https://github.com/phpmyadmin/phpmyadmin/commit/50edafc0884aa15d0a1aa178089ac6a1ad2eb18a
  Author: Michal Čihař <[email protected]>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M js/functions.js
    M libraries/header_http.inc.php

  Log Message:
  -----------
  Load JSON rather than javascript from phpmyadmin.net

Conflicts:
        js/functions.js
        libraries/Header.class.php


  Commit: a547f3d3e2cf36c6a904fa3e053fd8bddd3fbbb0
      
https://github.com/phpmyadmin/phpmyadmin/commit/a547f3d3e2cf36c6a904fa3e053fd8bddd3fbbb0
  Author: Michal Čihař <[email protected]>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Escape json reply received from server


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ceaee4471b75...a547f3d3e2cf
------------------------------------------------------------------------------
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