[Dolibarr-git] [Dolibarr/dolibarr] 0d3a2f: fix colspan in show_project

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0d3a2f800bb3fdeba33c3fcde651c92920534db4
      
https://github.com/Dolibarr/dolibarr/commit/0d3a2f800bb3fdeba33c3fcde651c92920534db4
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-09-12 (Thu, 12 Sep 2019)

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

  Log Message:
  -----------
  fix colspan in show_project


  Commit: 6db7414f88f717e8d16e9ba9be66f758f31c49cb
      
https://github.com/Dolibarr/dolibarr/commit/6db7414f88f717e8d16e9ba9be66f758f31c49cb
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-09-12 (Thu, 12 Sep 2019)

  Changed paths:
    A .stickler.yml

  Log Message:
  -----------
  Create .stickler.yml


  Commit: 00394493eb2e818ce2ce06259f1cc1d0f60157fd
      
https://github.com/Dolibarr/dolibarr/commit/00394493eb2e818ce2ce06259f1cc1d0f60157fd
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-09-12 (Thu, 12 Sep 2019)

  Changed paths:
    M htdocs/accountancy/index.php

  Log Message:
  -----------
  Update index.php


  Commit: fbb8808f295b400bdf6cc41007b955ebb597c53c
      
https://github.com/Dolibarr/dolibarr/commit/fbb8808f295b400bdf6cc41007b955ebb597c53c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-14 (Sat, 14 Sep 2019)

  Changed paths:
    M htdocs/accountancy/index.php

  Log Message:
  -----------
  Merge pull request #11887 from frederic34/patch-14

Update index.php


  Commit: 935e84d9854b5fbcbfbcabcf8003245258dedd2f
      
https://github.com/Dolibarr/dolibarr/commit/935e84d9854b5fbcbfbcabcf8003245258dedd2f
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-14 (Sat, 14 Sep 2019)

  Changed paths:
    A .stickler.yml

  Log Message:
  -----------
  Merge pull request #11885 from frederic34/patch-12

Create .stickler.yml


  Commit: 7aac67f79c76dfa951bb82c4335dd2f7a10f3d4e
      
https://github.com/Dolibarr/dolibarr/commit/7aac67f79c76dfa951bb82c4335dd2f7a10f3d4e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-14 (Sat, 14 Sep 2019)

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

  Log Message:
  -----------
  Merge pull request #11884 from frederic34/patch-10

fix colspan in show_project


  Commit: 56e070cd7f6989c0238553699bba26c06fddd604
      
https://github.com/Dolibarr/dolibarr/commit/56e070cd7f6989c0238553699bba26c06fddd604
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-14 (Sat, 14 Sep 2019)

  Changed paths:
    A .stickler.yml
    M htdocs/accountancy/index.php
    M htdocs/core/lib/company.lib.php

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

Conflicts:
        htdocs/accountancy/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d4e26fcc5517...56e070cd7f69