[Dolibarr-git] [Dolibarr/dolibarr] 30bfb0: Update categorie.php

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 30bfb0eee3c8c827f92662e0f5648c7753259711
      
https://github.com/Dolibarr/dolibarr/commit/30bfb0eee3c8c827f92662e0f5648c7753259711
  Author: AlainRnet <address@hidden>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M htdocs/categories/categorie.php

  Log Message:
  -----------
  Update categorie.php

voir https://github.com/Dolibarr/dolibarr/pull/3562


  Commit: f3a28682eaeda0a7de9b0a3475b4b44e632d7330
      
https://github.com/Dolibarr/dolibarr/commit/f3a28682eaeda0a7de9b0a3475b4b44e632d7330
  Author: tysauron <address@hidden>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

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

  Log Message:
  -----------
  For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE


  Commit: f8f1f4fd2b3710217cef96bbc94751cfff56fc6e
      
https://github.com/Dolibarr/dolibarr/commit/f8f1f4fd2b3710217cef96bbc94751cfff56fc6e
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M htdocs/categories/categorie.php

  Log Message:
  -----------
  Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into
AlainRnet-patch-2

Conflicts:
        htdocs/categories/categorie.php


  Commit: 7cfef16c24863ae610a1b781f306835604bebfc2
      
https://github.com/Dolibarr/dolibarr/commit/7cfef16c24863ae610a1b781f306835604bebfc2
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
    M htdocs/categories/categorie.php

  Log Message:
  -----------
  git push origin 3.8Merge branch 'AlainRnet-patch-2' into 3.8


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d633118bd48e...7cfef16c2486