Branch: refs/heads/master
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 21eda1c2c42d28370b91c99017dcee7eef9691fd
https://github.com/phpmyadmin/phpmyadmin/commit/21eda1c2c42d28370b91c99017d…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.0.6 release
Commit: e01419b47358b86bdc5997f1d5aabea2b8dd5b06
https://github.com/phpmyadmin/phpmyadmin/commit/e01419b47358b86bdc5997f1d5a…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_6' into QA_4_0
Commit: edcf5a031c2f094e4d17e1ad90b9647d5ae93226
https://github.com/phpmyadmin/phpmyadmin/commit/edcf5a031c2f094e4d17e1ad90b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix merge conflict
Commit: 3ac97c59efdf85346f7fef9323017a0a6b7d60af
https://github.com/phpmyadmin/phpmyadmin/commit/3ac97c59efdf85346f7fef93230…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'QA_4_0'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/2666ee50232a...3ac97c59efdf