Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2fdb15c36ef8a9a6d0622c4f1435104d56cc2dc8 https://github.com/phpmyadmin/phpmyadmin/commit/2fdb15c36ef8a9a6d0622c4f1435... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M libraries/replication.inc.php Log Message: ----------- Replace call to an old and unavailable function Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 593cbd271f3e5f78b3bc6e9cf11fbff067032fbe https://github.com/phpmyadmin/phpmyadmin/commit/593cbd271f3e5f78b3bc6e9cf11f... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Changed paths: M po/ckb.po M po/da.po M po/id.po M po/pt.po M po/ro.po M po/ta.po M po/vi.po Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 Commit: 31221e666c79cddd3e8bf62172e1fa1e7d4dc8fc https://github.com/phpmyadmin/phpmyadmin/commit/31221e666c79cddd3e8bf62172e1... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-11 (Tue, 11 Oct 2016) Log Message: ----------- Merge branch 'QA_4_6' Conflicts: libraries/replication.inc.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8ee14c065ab5...31221e666c79