dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 163665: FIX A page of a site replaced


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 163665: FIX A page of a site replaced with another when sw...
Date: Fri, 05 Apr 2019 10:40:32 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 163665e4b535c0dc6aef28edf031dae18757308c
      
https://github.com/Dolibarr/dolibarr/commit/163665e4b535c0dc6aef28edf031dae18757308c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-04-05 (Fri, 05 Apr 2019)

  Changed paths:
    M htdocs/website/index.php

  Log Message:
  -----------
  FIX A page of a site replaced with another when switching in edit mode

Conflicts:
        htdocs/website/index.php


  Commit: becefeebff7fae7bf81fd1f2a709e1b6b9833664
      
https://github.com/Dolibarr/dolibarr/commit/becefeebff7fae7bf81fd1f2a709e1b6b9833664
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-04-05 (Fri, 05 Apr 2019)

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

  Log Message:
  -----------
  Fix upload of files without extension


  Commit: 2a9c04b1ba01f9c02ba7515a9ebc6c872d6b54a5
      
https://github.com/Dolibarr/dolibarr/commit/2a9c04b1ba01f9c02ba7515a9ebc6c872d6b54a5
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-04-05 (Fri, 05 Apr 2019)

  Changed paths:

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0fd1f9abf6d4...2a9c04b1ba01



reply via email to

[Prev in Thread] Current Thread [Next in Thread]