Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0791b6b5ae04a6b1bb13ef8e32dc07227b7b4c27
https://github.com/phpmyadmin/phpmyadmin/commit/0791b6b5ae04a6b1bb13ef8e32dc07227b7b4c27
Author: Michal Čihař <[email protected]>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M server_status.php
Log Message:
-----------
Fix unresolved merge conflict
Commit: e9ba7339a7d1043603527ffad2302f3159e8d8d0
https://github.com/phpmyadmin/phpmyadmin/commit/e9ba7339a7d1043603527ffad2302f3159e8d8d0
Author: Michal Čihař <[email protected]>
Date: 2012-09-04 (Tue, 04 Sep 2012)
Changed paths:
M server_status.php
Log Message:
-----------
Coding style improvements
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/a0a04a561cf6...e9ba7339a7d1
------------------------------------------------------------------------------
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
