Branch: refs/heads/QA_4_1
Home:
https://github.com/phpmyadmin/phpmyadmin
Commit: 975870337b02b19e4afcbf4c9467c21e6c7a387f
https://github.com/phpmyadmin/phpmyadmin/commit/975870337b02b19e4afcbf4c946…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M ChangeLog
M doc/setup.rst
Log Message:
-----------
- bug #4163 Setup script does not recognize manually-configured server
- Improve English
Commit: 39e044d79570ce6143a761249297ff36d7b69ebb
https://github.com/phpmyadmin/phpmyadmin/commit/39e044d79570ce6143a76124929…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M ChangeLog
M doc/setup.rst
Log Message:
-----------
Fix merge conflicts
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/b09703e4856a...39e044d79570