Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ff358717e4b06bf3f58fc5ba23d0bb40b9ee51af https://github.com/phpmyadmin/phpmyadmin/commit/ff358717e4b06bf3f58fc5ba23d0... Author: Marc Delisle marc@infomarc.info Date: 2015-09-05 (Sat, 05 Sep 2015)

Changed paths: M ChangeLog M libraries/tbl_relation.lib.php

Log Message: ----------- Fix invalid argument supplied for foreach()

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: cd34ffab027ceb45641e05005217995454225824 https://github.com/phpmyadmin/phpmyadmin/commit/cd34ffab027ceb45641e05005217... Author: Marc Delisle marc@infomarc.info Date: 2015-09-05 (Sat, 05 Sep 2015)

Changed paths: M ChangeLog M templates/table/relation/common_form.phtml

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/afbe065bdea7...cd34ffab027c