[Dolibarr-git] [Dolibarr/dolibarr] 2cf28e: more minor grammar corrections

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2cf28e055b71c605b140ce0773a51c2b7a4fb9c3
      
https://github.com/Dolibarr/dolibarr/commit/2cf28e055b71c605b140ce0773a51c2b7a4fb9c3
  Author: Steve <address@hidden>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/ecm.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/opensurvey.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/sms.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/en_US/withdrawals.lang

  Log Message:
  -----------
  more minor grammar corrections

Conflicts:
        htdocs/langs/en_US/admin.lang
        htdocs/langs/en_US/companies.lang
        htdocs/langs/en_US/exports.lang
        htdocs/langs/en_US/mails.lang
        htdocs/langs/en_US/products.lang
        htdocs/langs/en_US/sms.lang


  Commit: 6846ff7d21a51d3b71d35ce07fd2e7efd24bac8f
      
https://github.com/Dolibarr/dolibarr/commit/6846ff7d21a51d3b71d35ce07fd2e7efd24bac8f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M htdocs/core/class/notify.class.php

  Log Message:
  -----------
  Fix problem in some vars as reported in #8955


  Commit: 3710f95719d968330e941b54ff92923ed9e9ad5c
      
https://github.com/Dolibarr/dolibarr/commit/3710f95719d968330e941b54ff92923ed9e9ad5c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-07-16 (Mon, 16 Jul 2018)

  Changed paths:
    M htdocs/core/class/notify.class.php
    M htdocs/langs/en_US/exports.lang

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

Conflicts:
        htdocs/langs/en_US/exports.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/387abf2da8b3...3710f95719d9
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.