[Dolibarr-git] [Dolibarr/dolibarr] 2ad912: Update combinations.php

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2ad91213b2dd5c2bcd136b51f8a281f688df6378
      
https://github.com/Dolibarr/dolibarr/commit/2ad91213b2dd5c2bcd136b51f8a281f688df6378
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Update combinations.php


  Commit: c1fa48889e83c7dbe3a87217dff0fa696844d17e
      
https://github.com/Dolibarr/dolibarr/commit/c1fa48889e83c7dbe3a87217dff0fa696844d17e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-24 (Sun, 24 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Merge pull request #10677 from frederic34/patch-6

fix #10385


  Commit: a48e9fdba40a54ce474561b586f2a73398e28ac8
      
https://github.com/Dolibarr/dolibarr/commit/a48e9fdba40a54ce474561b586f2a73398e28ac8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-27 (Wed, 27 Feb 2019)

  Changed paths:
    M htdocs/variants/combinations.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6fdd0191f4f3...a48e9fdba40a