Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8486d8afa7ed42a829249485a09bd65ca0ab68ff https://github.com/phpmyadmin/phpmyadmin/commit/8486d8afa7ed42a829249485a09b... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M templates/server/databases/table_row.phtml Log Message: ----------- Use correct value as an argument to the Collation Description function Fix #13135 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 4248e33aedb5cc643710779a2d9db69e7106a2ea https://github.com/phpmyadmin/phpmyadmin/commit/4248e33aedb5cc643710779a2d9d... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for #13135 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 827c71f86ac335295438de7d03824429799cde06 https://github.com/phpmyadmin/phpmyadmin/commit/827c71f86ac335295438de7d0382... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M ChangeLog M templates/server/databases/table_row.phtml Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8643692d75fc...827c71f86ac3