Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ac4143a8c974475a7f0758d3224024233cf57cb2 https://github.com/phpmyadmin/phpmyadmin/commit/ac4143a8c974475a7f0758d32240... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-17 (Wed, 17 Feb 2016)

Changed paths: M ChangeLog M doc/config.rst

Log Message: ----------- Fix #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 9a4615b793638d4a439fc641781a6fa0a5cfab3e https://github.com/phpmyadmin/phpmyadmin/commit/9a4615b793638d4a439fc641781a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2016-02-17 (Wed, 17 Feb 2016)

Changed paths: M ChangeLog M doc/config.rst

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9249a8f58641...9a4615b79363