Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ba24c28eda01f45b17006cd345a0821f8c618f88 https://github.com/phpmyadmin/phpmyadmin/commit/ba24c28eda01f45b17006cd345a0... Author: Marc Delisle marc@infomarc.info Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths: M ChangeLog M templates/table/structure/display_structure.phtml
Log Message: ----------- Fixes #11658 Collation column is empty in table Structure
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 739df4a1d867bc06481461d2b759a739e8acf2d4 https://github.com/phpmyadmin/phpmyadmin/commit/739df4a1d867bc06481461d2b759... Author: Marc Delisle marc@infomarc.info Date: 2015-11-11 (Wed, 11 Nov 2015)
Changed paths: M ChangeLog M templates/table/structure/display_structure.phtml
Log Message: ----------- Merge branch 'QA_4_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/896f0fabfc94...739df4a1d867