Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a6dd27897ee819155625a3a17262298f6de45335 https://github.com/phpmyadmin/phpmyadmin/commit/a6dd27897ee819155625a3a17262... Author: Michal Čihař michal@cihar.com Date: 2016-10-25 (Tue, 25 Oct 2016)

Changed paths: R phpdox.xml

Log Message: ----------- Remove no longer used file

The docs is now generated using ApiGen.

See also phpmyadmin/docker#78

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

Commit: 1c5c4860c2a73a45b7b373f8d643927ff095c2af https://github.com/phpmyadmin/phpmyadmin/commit/1c5c4860c2a73a45b7b373f8d643... Author: Michal Čihař michal@cihar.com Date: 2016-10-25 (Tue, 25 Oct 2016)

Changed paths: R phpdox.xml

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/39f09e7aa972...1c5c4860c2a7