[Dolibarr-git] [Dolibarr/dolibarr] 146492: Fix: load only textarea for nl2br

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 1464929fed70efe0c75e83aa2d07fce114675335
      
https://github.com/Dolibarr/dolibarr/commit/1464929fed70efe0c75e83aa2d07fce114675335
  Author: Regis Houssin <address@hidden>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Changed paths:
    M htdocs/compta/deplacement/fiche.php
  M htdocs/core/ajax/loadinplace.php
  M htdocs/core/ajax/saveinplace.php
  M htdocs/core/js/editinplace.js

  Log Message:
  -----------
  Fix: load only textarea for nl2br


  Commit: db54139b385628664b4e98d21b3b278078b83602
      
https://github.com/Dolibarr/dolibarr/commit/db54139b385628664b4e98d21b3b278078b83602
  Author: Regis Houssin <address@hidden>
  Date:   2011-10-27 (Thu, 27 Oct 2011)

  Log Message:
  -----------
  Merge branch 'develop' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
develop

Conflicts:
        htdocs/compta/deplacement/fiche.php


Compare: https://github.com/Dolibarr/dolibarr/compare/85119f4...db54139