Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 89030732fee2574015bcb3a16df53e73fc3701eb https://github.com/phpmyadmin/phpmyadmin/commit/89030732fee2574015bcb3a16df5... Author: Marc Delisle marc@infomarc.info Date: 2017-03-10 (Fri, 10 Mar 2017)

Changed paths: M doc/credits.rst

Log Message: ----------- Update credits about Marc Delisle

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: b4c2d2988f460ddbf11090c06938cf599cd8cbb5 https://github.com/phpmyadmin/phpmyadmin/commit/b4c2d2988f460ddbf11090c06938... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-03-12 (Sun, 12 Mar 2017)

Changed paths: M doc/credits.rst

Log Message: ----------- Merge pull request #13063 from lem9/patch-2

Update credits about Marc Delisle

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2f19c3732319...b4c2d2988f46