Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8333e8f814e57705dcea9b1e52899e2fe3efdc66 https://github.com/phpmyadmin/phpmyadmin/commit/8333e8f814e57705dcea9b1e5289... Author: Bournvita1998 mohit.kuri@research.iiit.ac.in Date: 2019-03-06 (Wed, 03 March 2019) +01:00

Changed paths: M view_create.php

Log Message: ----------- Fix #14868 - Edit View

Fixes: #14868 Introduced-by: 42561e689613e6712920bada4e2f957a96252f97 Signed-off-by: Bournvita1998 mohit.kuri@research.iiit.ac.in

Commit: 50c8ca99b6ec35b8dcf1fa0b64fbf8e16d53ecaf https://github.com/phpmyadmin/phpmyadmin/commit/50c8ca99b6ec35b8dcf1fa0b64fb... Author: William Desportes williamdes@wdes.fr Date: 2019-03-06 (Wed, 03 March 2019) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #14868

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: e431695d5430a8de872de47c76cd370cd1e2ed20 https://github.com/phpmyadmin/phpmyadmin/commit/e431695d5430a8de872de47c76cd... Author: William Desportes williamdes@wdes.fr Date: 2019-03-06 (Wed, 03 March 2019) +01:00

Changed paths: M doc/two_factor.rst

Log Message: ----------- Fix link to shop.trezor.io

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 9cd5db0a701d1c2642fd9cc88dcbff57207294dc https://github.com/phpmyadmin/phpmyadmin/commit/9cd5db0a701d1c2642fd9cc88dcb... Author: William Desportes williamdes@wdes.fr Date: 2019-03-06 (Wed, 03 March 2019) +01:00

Changed paths: M ChangeLog M doc/two_factor.rst M view_create.php

Log Message: ----------- Merge branch 'QA_4_8'

Closes: https://github.com/phpmyadmin/phpmyadmin/pull/14998 Signed-off-by: William Desportes williamdes@wdes.fr