Branch: refs/heads/QA_4_8 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 294a22c1d40689a5185c7f4253e0080d01a1e0b5 https://github.com/phpmyadmin/phpmyadmin/commit/294a22c1d40689a5185c7f4253e0... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-03-28 (Wed, 28 Mar 2018)

Changed paths: M doc/conf.py M doc/copyright.rst

Log Message: ----------- Update copyright years

Signed-off-by: Maurício Meneghini Fauth mauriciofauth@gmail.com

Commit: 20407323dd57423e28ddc4e78d07cc375216cae8 https://github.com/phpmyadmin/phpmyadmin/commit/20407323dd57423e28ddc4e78d07... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-03-28 (Wed, 28 Mar 2018)

Changed paths: M doc/conf.py M doc/copyright.rst

Log Message: ----------- Merge branch 'QA_4_7' into QA_4_8

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ca7fd2b2c737...20407323dd57