Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3b170da62cfc6d9afb81c4e78aefc6ece350527 https://github.com/phpmyadmin/phpmyadmin/commit/b3b170da62cfc6d9afb81c4e78ae... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-03-05 (Mon, 05 Mar 2018) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for version 4.7.9 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 80914e327e4deafe78e0813ffdba7fce8acf10ac https://github.com/phpmyadmin/phpmyadmin/commit/80914e327e4deafe78e0813ffdba... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-03-05 (Mon, 05 Mar 2018) Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 4.7.9 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 8775f7a3b0642c603c0783569d2704d6759b332a https://github.com/phpmyadmin/phpmyadmin/commit/8775f7a3b0642c603c0783569d27... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-03-05 (Mon, 05 Mar 2018) Changed paths: R composer.lock Log Message: ----------- Removing composer.lock Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 9c11715e7589bbf5870786b7b047ba0aff13a3b2 https://github.com/phpmyadmin/phpmyadmin/commit/9c11715e7589bbf5870786b7b047... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-03-05 (Mon, 05 Mar 2018) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.7.10-dev Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: ff86a1b0f813e55f6d0bd4015eb6ac56860fd0c4 https://github.com/phpmyadmin/phpmyadmin/commit/ff86a1b0f813e55f6d0bd4015eb6... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-03-05 (Mon, 05 Mar 2018) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts from 4.7.9 release Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b315e1cac5cd...ff86a1b0f813