Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a8a2986b567ddb2d800358fe8b7662003ff9e9c6 https://github.com/phpmyadmin/phpmyadmin/commit/a8a2986b567ddb2d800358fe8b76... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths: M libraries/Table.class.php M libraries/controllers/StructureController.class.php M libraries/controllers/TableRelationController.class.php M libraries/display_create_table.lib.php

Log Message: ----------- Fix more coding style issues related to function call signature

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 687d8d9c9ce6be9998c9f336129503a6df63e8e2 https://github.com/phpmyadmin/phpmyadmin/commit/687d8d9c9ce6be9998c9f3361295... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths: M po/ca.po M po/fr.po

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6b9addc76523...687d8d9c9ce6