Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ed048bd10f42dcbfbb628718e06f851b88f11b86 https://github.com/phpmyadmin/phpmyadmin/commit/ed048bd10f42dcbfbb628718e06f... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-26 (Thu, 12 December 2019) -05:00 Changed paths: M ChangeLog M README M doc/conf.py M libraries/classes/Config.php M package.json Log Message: ----------- Prepare for version 4.9.3 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: be969e94b36b08a4c8b1de9aae8ea7384b342a1b https://github.com/phpmyadmin/phpmyadmin/commit/be969e94b36b08a4c8b1de9aae8e... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-26 (Thu, 12 December 2019) -05:00 Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 0f159139c3c3794ec7007e9163486d8edf2412f8 https://github.com/phpmyadmin/phpmyadmin/commit/0f159139c3c3794ec7007e916348... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-26 (Thu, 12 December 2019) -05:00 Changed paths: M ChangeLog M README M doc/conf.py M libraries/classes/Config.php M package.json Log Message: ----------- Prepare for version 5.0.0 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: c124aacc32329f69f3e8189c61c5d82f6d9fcd47 https://github.com/phpmyadmin/phpmyadmin/commit/c124aacc32329f69f3e8189c61c5... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-26 (Thu, 12 December 2019) -05:00 Changed paths: A composer.lock Log Message: ----------- Adding composer lock for 5.0.0 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 96a06cef33aac590cd26c8897ed4cbdfa6fa8425 https://github.com/phpmyadmin/phpmyadmin/commit/96a06cef33aac590cd26c8897ed4... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-26 (Thu, 12 December 2019) -05:00 Changed paths: D composer.lock Log Message: ----------- Removing composer.lock Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 66f18ab9214d0221e5e1c3139882f914dea92c7e https://github.com/phpmyadmin/phpmyadmin/commit/66f18ab9214d0221e5e1c3139882... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-27 (Fri, 12 December 2019) -05:00 Changed paths: M ChangeLog M README M doc/conf.py M libraries/classes/Config.php M package.json Log Message: ----------- Prepare for 5.0.1-dev Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: f928a3d6cda95170495f8ca7999724d7b9b374b1 https://github.com/phpmyadmin/phpmyadmin/commit/f928a3d6cda95170495f8ca79997... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2019-12-27 (Fri, 12 December 2019) -05:00 Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Signed-off-by: Isaac Bennetch <bennetch@gmail.com>