Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8bbbf7e0610572a54ab902feecc535e1e6a1efd3 https://github.com/phpmyadmin/phpmyadmin/commit/8bbbf7e0610572a54ab902feecc5... Author: Marc Delisle marc@infomarc.info Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths: M ChangeLog M Documentation.html M README M libraries/Config.class.php
Log Message: ----------- 3.5.7
Commit: fb7d066c8e027617b991991f8115676d9de06533 https://github.com/phpmyadmin/phpmyadmin/commit/fb7d066c8e027617b991991f8115... Author: Marc Delisle marc@infomarc.info Date: 2013-02-15 (Fri, 15 Feb 2013)
Log Message: ----------- Merge branch 'MAINT_3_5_7' into QA_3_5
Commit: 3b0323dda3d4685259c0c501affed1a2b3cd8739 https://github.com/phpmyadmin/phpmyadmin/commit/3b0323dda3d4685259c0c501affe... Author: Marc Delisle marc@infomarc.info Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths: M ChangeLog
Log Message: ----------- Fix merge conflicts
Commit: 4ba78fd52d82d7eb81e1fd84a8c5cafa1fa16eab https://github.com/phpmyadmin/phpmyadmin/commit/4ba78fd52d82d7eb81e1fd84a8c5... Author: Marc Delisle marc@infomarc.info Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths: M ChangeLog
Log Message: ----------- Merge branch 'QA_3_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0d39d7c16380...4ba78fd52d82
-
Marc Delisle