[Dolibarr-git] [Dolibarr/dolibarr] 02e0fa: "or" into if instead of ||

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 02e0fac79f10475d4ec4482cbe296a151f3fe176
      
https://github.com/Dolibarr/dolibarr/commit/02e0fac79f10475d4ec4482cbe296a151f3fe176
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  "or" into if instead of ||


  Commit: 2aa2f896c6d167b09468328f65d9cadcb6ac335e
      
https://github.com/Dolibarr/dolibarr/commit/2aa2f896c6d167b09468328f65d9cadcb6ac335e
  Author: Florian HENRY <address@hidden>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/doc.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/includes/odtphp/Segment.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/livraison/fiche.php
    M htdocs/projet/fiche.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M test/phpunit/AllTests.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FunctionsLibTest.php

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


  Commit: f855709cf42f471128c7af684b66ddca440d44fe
      
https://github.com/Dolibarr/dolibarr/commit/f855709cf42f471128c7af684b66ddca440d44fe
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-10 (Sat, 10 May 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Merge pull request #1585 from FHenry/3.5

        "or" into if instead of ||


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a627dd9ae804...f855709cf42f