Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0791b6b5ae04a6b1bb13ef8e32dc07227b7b4c27 https://github.com/phpmyadmin/phpmyadmin/commit/0791b6b5ae04a6b1bb13ef8e32dc... Author: Michal Čihař michal@cihar.com 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/e9ba7339a7d1043603527ffad230... Author: Michal Čihař michal@cihar.com 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