Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 903000ce1b944c8fc60b58a6c865927418a90c4d https://github.com/phpmyadmin/phpmyadmin/commit/903000ce1b944c8fc60b58a6c865... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-24 (Wed, 24 Jun 2015)

Changed paths: M libraries/db_designer.lib.php M libraries/display_export.inc.php M libraries/display_import.inc.php

Log Message: ----------- Specify types

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

Commit: da49e8fe71fdb2f6aa0c4cf45eec2957e3889aa7 https://github.com/phpmyadmin/phpmyadmin/commit/da49e8fe71fdb2f6aa0c4cf45eec... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-24 (Wed, 24 Jun 2015)

Changed paths: M libraries/config/FormDisplay.tpl.php M test/libraries/PMA_FormDisplay_tpl_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8725217b2965...da49e8fe71fd