Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 677f7276171f926c0e7899f159c2a1452e36ffa6 https://github.com/phpmyadmin/phpmyadmin/commit/677f7276171f926c0e7899f159c2... Author: Michal Čihař michal@cihar.com Date: 2016-05-17 (Tue, 17 May 2016)

Changed paths: M libraries/config/messages.inc.php

Log Message: ----------- Remove non working links from config option descriptions

These links are not working since 4.2.0 and nobody complained, so I assume they are really not needed.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3c3642cd1706dbbd42d23dff41fa0b347d17f58c https://github.com/phpmyadmin/phpmyadmin/commit/3c3642cd1706dbbd42d23dff41fa... Author: Michal Čihař michal@cihar.com Date: 2016-05-17 (Tue, 17 May 2016)

Changed paths: M libraries/config/messages.inc.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a2b8bfc308a1...3c3642cd1706