Branch: refs/heads/QA_4_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 975870337b02b19e4afcbf4c9467c21e6c7a387f
      
https://github.com/phpmyadmin/phpmyadmin/commit/975870337b02b19e4afcbf4c9467c21e6c7a387f
  Author: Marc Delisle <m...@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/39e044d79570ce6143a761249297ff36d7b69ebb
  Author: Marc Delisle <m...@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
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to