Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 21741c5edd3cf27a240e50bf1515f99354d0c139 https://github.com/phpmyadmin/phpmyadmin/commit/21741c5edd3cf27a240e50bf1515... Author: tmtisfree <tmtisfree@free.fr> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M po/fr.po Log Message: ----------- Translated using Weblate (French) Currently translated at 100.0% (3192 of 3192 strings) [CI skip] Commit: 548b6b4d0ebdefc352d5aff3d191e8c57273399f https://github.com/phpmyadmin/phpmyadmin/commit/548b6b4d0ebdefc352d5aff3d191... Author: Weblate <noreply@weblate.org> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M ChangeLog M libraries/RecentFavoriteTable.php M libraries/controllers/database/DatabaseStructureController.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: c1b9c83b766f4efe904874fec996623e4cf8e26e https://github.com/phpmyadmin/phpmyadmin/commit/c1b9c83b766f4efe904874fec996... Author: Raghuram <raghuram.vadapalli@research.iiit.ac.in> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M libraries/Table.php Log Message: ----------- Fixes adding attribute while updating virtual col Fixes #13105 Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in> Commit: 211541f56ed9d137bb19c0133601fca9339e0d01 https://github.com/phpmyadmin/phpmyadmin/commit/211541f56ed9d137bb19c0133601... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #13105 and #13107 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 1584708b09205e8fb2d82276430b9fe7106eff4d https://github.com/phpmyadmin/phpmyadmin/commit/1584708b09205e8fb2d82276430b... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-20 (Mon, 20 Mar 2017) Log Message: ----------- Merge commit '548b6b4d0ebdefc352d5aff3d191e8c57273399f' Commit: 2c48b61757472ca4f0b90f8f0144a86877a44a35 https://github.com/phpmyadmin/phpmyadmin/commit/2c48b61757472ca4f0b90f8f0144... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-20 (Mon, 20 Mar 2017) Changed paths: M ChangeLog M libraries/Table.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/841dbe678f50...2c48b6175747