[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ff812e: Fix a merge mistake

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ff812e93666a56fab0b8ab9dde125726bfb19d21 https://github.com/phpmyadmin/phpmyadmin/commit/ff812e93666a56fab0b8ab9dde1… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-24 (Sun, 11 November 2019) +01:00 Changed paths: M libraries/classes/Controllers/Table/RelationController.php Log Message: ----------- Fix a merge mistake Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 9754f848666e1b13b291671e7c4629a0e7058be7 https://github.com/phpmyadmin/phpmyadmin/commit/9754f848666e1b13b291671e7c4… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-11-24 (Sun, 11 November 2019) +01:00 Changed paths: M libraries/classes/Controllers/Table/RelationController.php Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr>