Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4c2c5622045dfb781bada8674e25a2e892880c21 https://github.com/phpmyadmin/phpmyadmin/commit/4c2c5622045dfb781bada8674e25... Author: Michal Čihař michal@cihar.com Date: 2016-08-04 (Thu, 04 Aug 2016)

Changed paths: M doc/faq.rst

Log Message: ----------- Suggest more secure Apache configuration

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

Commit: 0172751bf687f1ee50bf209e2d6cff3c4583e964 https://github.com/phpmyadmin/phpmyadmin/commit/0172751bf687f1ee50bf209e2d6c... Author: Michal Čihař michal@cihar.com Date: 2016-08-04 (Thu, 04 Aug 2016)

Changed paths: M doc/faq.rst

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c9e5f6ff1b3f...0172751bf687