Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ff358717e4b06bf3f58fc5ba23d0bb40b9ee51af
https://github.com/phpmyadmin/phpmyadmin/commit/ff358717e4b06bf3f58fc5ba23d0bb40b9ee51af
Author: Marc Delisle <m...@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 <m...@infomarc.info>
Commit: cd34ffab027ceb45641e05005217995454225824
https://github.com/phpmyadmin/phpmyadmin/commit/cd34ffab027ceb45641e05005217995454225824
Author: Marc Delisle <m...@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 <m...@infomarc.info>
Commit: aa84bfd5940e387b2d11c7ef8a1df933b929ac33
https://github.com/phpmyadmin/phpmyadmin/commit/aa84bfd5940e387b2d11c7ef8a1df933b929ac33
Author: Marc Delisle <m...@infomarc.info>
Date: 2015-09-05 (Sat, 05 Sep 2015)
Changed paths:
M ChangeLog
M templates/table/relation/common_form.phtml
Log Message:
-----------
Merge branch 'QA_4_5'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/8e836bdfc849...aa84bfd5940e
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git