Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1fb040a1df77afd8059683b29fd09c6e17a8d6e6 https://github.com/phpmyadmin/phpmyadmin/commit/1fb040a1df77afd8059683b29fd0... Author: Michal Čihař michal@cihar.com Date: 2016-12-22 (Thu, 22 Dec 2016)

Changed paths: M ChangeLog M libraries/Table.php

Log Message: ----------- Fixed editing of virtual columns

Fixes #12847

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 98ef4de075061dacef477a3cadc288fd06d652a5 https://github.com/phpmyadmin/phpmyadmin/commit/98ef4de075061dacef477a3cadc2... Author: Michal Čihař michal@cihar.com Date: 2016-12-22 (Thu, 22 Dec 2016)

Changed paths: M ChangeLog M libraries/Table.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e312264e5595...98ef4de07506