[Dolibarr-git] [Dolibarr/dolibarr] 5c8e92: Closes #2535 Bug: Untranslated string in "Linked o...

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5c8e92d52a8269de43753c60c080f29a797a53db
      
https://github.com/Dolibarr/dolibarr/commit/5c8e92d52a8269de43753c60c080f29a797a53db
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-04-04 (Sat, 04 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Closes #2535 Bug: Untranslated string in "Linked objects" page of a project


  Commit: a42eb7b787cf342bd2b59f498a004c74cf90cd1c
      
https://github.com/Dolibarr/dolibarr/commit/a42eb7b787cf342bd2b59f498a004c74cf90cd1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch 'bug-2535' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-2535

Conflicts:
        ChangeLog


  Commit: 6afde94acf66a62f82e9a63b87c671f6078da880
      
https://github.com/Dolibarr/dolibarr/commit/6afde94acf66a62f82e9a63b87c671f6078da880
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-06 (Mon, 06 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/projet/element.php

  Log Message:
  -----------
  git push origin 3.6Merge branch 'marcosgdf-bug-2535' into 3.6


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a92c8ccbd554...6afde94acf66