Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa74cd29fbf7e7e0fe61fc0bf5d14e01a1887e43 https://github.com/phpmyadmin/phpmyadmin/commit/aa74cd29fbf7e7e0fe61fc0bf5d1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-11 (Wed, 11 Mar 2015)

Changed paths: M libraries/tbl_columns_definition_form.lib.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php

Log Message: ----------- Styles were affecting edit columns as well as edit central columns

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

Commit: 1e6d05935b8375dcb1a3932886a177c9c0d42ee3 https://github.com/phpmyadmin/phpmyadmin/commit/1e6d05935b8375dcb1a3932886a1... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-11 (Wed, 11 Mar 2015)

Changed paths: M po/nb.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3bdd462da613...1e6d05935b83