[Dolibarr-git] [Dolibarr/dolibarr] 181fac: Fix: End of line character is invalid; expected "\...

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 181fac1d9dbef333aaf62bd4597955c2725193f8
      
https://github.com/Dolibarr/dolibarr/commit/181fac1d9dbef333aaf62bd4597955c2725193f8
  Author: Regis Houssin <address@hidden>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M htdocs/core/ajax/extraparams.php

  Log Message:
  -----------
  Fix: End of line character is invalid; expected "\n" but found "\r\n"


  Commit: e16b1067cd424a8e8290cbb2ed3b7e24735e5dcd
      
https://github.com/Dolibarr/dolibarr/commit/e16b1067cd424a8e8290cbb2ed3b7e24735e5dcd
  Author: Regis Houssin <address@hidden>
  Date:   2012-03-17 (Sat, 17 Mar 2012)

  Changed paths:
    M htdocs/core/ajax/extraparams.php

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

Conflicts:
        htdocs/core/ajax/extraparams.php


Compare: https://github.com/Dolibarr/dolibarr/compare/938d0be...e16b106