[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cf4d94: Fix #4416 New lines are removed when grid editing

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cf4d94527c53e0c3813de185627f79b245ae7c9d
      https://github.com/phpmyadmin/phpmyadmin/commit/cf4d94527c53e0c3813de185627f79b245ae7c9d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-01-03 (Sat, 03 Jan 2015)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Fix #4416 New lines are removed when grid editing

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


  Commit: 63bf881f26820453573cd31e6b10591b08b4e6d1
      https://github.com/phpmyadmin/phpmyadmin/commit/63bf881f26820453573cd31e6b10591b08b4e6d1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Merge pull request #1447 from Tithugues/b4416_qa43

Fix #4416 New lines are removed when grid editing


  Commit: 760c61d78ca0eb42eb8adc495a23430f74ae6137
      https://github.com/phpmyadmin/phpmyadmin/commit/760c61d78ca0eb42eb8adc495a23430f74ae6137
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 100.0% (2979 of 2979 strings)

[CI skip]


  Commit: 3777e0a1985b736b55f66085e4dae094c1bfca57
      https://github.com/phpmyadmin/phpmyadmin/commit/3777e0a1985b736b55f66085e4dae094c1bfca57
  Author: Weblate <noreply at weblate.org>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 440afe2423bd2eb1cda2df2ecf455c7fde6eff53
      https://github.com/phpmyadmin/phpmyadmin/commit/440afe2423bd2eb1cda2df2ecf455c7fde6eff53
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 89de2f6227b5bf37f07c18352e893eff83937d1c
      https://github.com/phpmyadmin/phpmyadmin/commit/89de2f6227b5bf37f07c18352e893eff83937d1c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Merge commit 'cf4d945'


  Commit: d18c1e25f589b0ebf9f88abc6af74a42ae96e441
      https://github.com/phpmyadmin/phpmyadmin/commit/d18c1e25f589b0ebf9f88abc6af74a42ae96e441
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Log Message:
  -----------
  Merge commit '3777e0a'


  Commit: 495250f8cb39c6ed85505bd9c97587fc12a15b8c
      https://github.com/phpmyadmin/phpmyadmin/commit/495250f8cb39c6ed85505bd9c97587fc12a15b8c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_3'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/763707a72e36...495250f8cb39