[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2efdf5: Make PHPCS happy.

[Hugues Peccatte]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2efdf5f19796767c4a9e80f662735da7dc9894b5
      https://github.com/phpmyadmin/phpmyadmin/commit/2efdf5f19796767c4a9e80f662735da7dc9894b5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    A templates/javascript/display.phtml

  Log Message:
  -----------
  Make PHPCS happy.
Return null values instead of void.
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 7d295166c595b632bf60f0731ec73b4172413c8b
      https://github.com/phpmyadmin/phpmyadmin/commit/7d295166c595b632bf60f0731ec73b4172413c8b
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M po/he.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/398dc6409698...7d295166c595