Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: efe97b150066dc7f0882885c2c5e43860ff7df98 https://github.com/phpmyadmin/phpmyadmin/commit/efe97b150066dc7f0882885c2c5e... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-08-27 (Sat, 27 Aug 2016)

Changed paths: M ChangeLog M templates/columns_definitions/transformation_option.phtml

Log Message: ----------- Unable to edit transformations, issue 12292

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: 63600798fdc7a07952f199682004ebe563c49b43 https://github.com/phpmyadmin/phpmyadmin/commit/63600798fdc7a07952f199682004... Author: Isaac Bennetch bennetch@gmail.com Date: 2016-08-27 (Sat, 27 Aug 2016)

Changed paths: M ChangeLog M templates/columns_definitions/transformation_option.phtml

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b4807f74e8af...63600798fdc7