[Dolibarr-git] [Dolibarr/dolibarr] a54dd1: fixed typos in trips.lang

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a54dd15afb770c688b9881d3db86d7ecb10362e2
      
https://github.com/Dolibarr/dolibarr/commit/a54dd15afb770c688b9881d3db86d7ecb10362e2
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  fixed typos in trips.lang


  Commit: 066e05a8ef9fe2fafd1aaa263077d7a6194a69ed
      
https://github.com/Dolibarr/dolibarr/commit/066e05a8ef9fe2fafd1aaa263077d7a6194a69ed
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  another typo


  Commit: c21961c4d8b5241152dc7570e9786de8b0283bf4
      
https://github.com/Dolibarr/dolibarr/commit/c21961c4d8b5241152dc7570e9786de8b0283bf4
  Author: faust <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  word order in workflow.lang


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

  Changed paths:
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/novalore/dolibarr into
novalore-develop

Conflicts:
        htdocs/langs/en_US/trips.lang


  Commit: 904eeddf8d781cc307b705b499d6574561427258
      
https://github.com/Dolibarr/dolibarr/commit/904eeddf8d781cc307b705b499d6574561427258
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  git push origin developMerge branch 'novalore-develop' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/56173999748d...904eeddf8d78