[Dolibarr-git] [Dolibarr/dolibarr] df066c: Fix: PHPCS

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: df066c374195adbd2a73cc4bf2e3a7a71bd90e4f
      
https://github.com/Dolibarr/dolibarr/commit/df066c374195adbd2a73cc4bf2e3a7a71bd90e4f
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M .travis.yml
    M dev/codesniffer/ruleset.xml
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/javascript/facturation1.js
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: PHPCS


  Commit: f261e1736cf6e55ef1dbc1da0e3dc20b567d52bf
      
https://github.com/Dolibarr/dolibarr/commit/f261e1736cf6e55ef1dbc1da0e3dc20b567d52bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M build/obs/README

  Log Message:
  -----------
  Update doc


  Commit: 72c3954f36c436b1e8987218613947dda0f67e0b
      
https://github.com/Dolibarr/dolibarr/commit/72c3954f36c436b1e8987218613947dda0f67e0b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M .travis.yml
    M build/obs/README
    M dev/codesniffer/ruleset.xml
    M htdocs/cashdesk/javascript/dhtml.js
    M htdocs/cashdesk/javascript/facturation1.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
        .travis.yml


Compare: 
https://github.com/Dolibarr/dolibarr/compare/344aa4085833...72c3954f36c4