[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3ff7a2: Use 'username' instead of 'user' to be consistent ...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3ff7a264269187298ddc93194c1dfcdd5b5da6a9
      https://github.com/phpmyadmin/phpmyadmin/commit/3ff7a264269187298ddc93194c1dfcdd5b5da6a9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M libraries/db_designer.lib.php
    M sql/create_tables.sql
    M sql/create_tables_drizzle.sql

  Log Message:
  -----------
  Use 'username' instead of 'user' to be consistent with other phpMyAdmin tables

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 8bbb4af2e72a31e1910bb59854ea7654e7621d1a
      https://github.com/phpmyadmin/phpmyadmin/commit/8bbb4af2e72a31e1910bb59854ea7654e7621d1a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M po/nl.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ef93940e13a6...8bbb4af2e72a