[Dolibarr/dolibarr] 4ae26b: Work whatever is running dir

[Laurent Destailleur]

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

  Changed paths:
    M dev/translation/txpull.sh
    M dev/translation/txpush.sh

  Log Message:
  -----------
  Work whatever is running dir


  Commit: 2e2c9562e8803aa723d2e02303a7916e1988ceb8
      
https://github.com/Dolibarr/dolibarr/commit/2e2c9562e8803aa723d2e02303a7916e1988ceb8
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-05 (Thu, 05 Dec 2019)

  Changed paths:
    M dev/initdemo/documents_demo/adherent/1/photos/person5.jpeg
    M dev/initdemo/documents_demo/adherent/3/photos/person9.jpeg
    M dev/initdemo/documents_demo/adherent/4/photos/person2.jpeg
    A dev/initdemo/documents_demo/societe/12/courrier_consult.odt
    A dev/initdemo/documents_demo/societe/12/logos/person8.jpeg
    R dev/initdemo/documents_demo/societe/12/logos/pierrecurie.jpg
    A dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_mini.jpeg
    A dev/initdemo/documents_demo/societe/12/logos/thumbs/person8_small.jpeg
    R dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_mini.jpg
    R dev/initdemo/documents_demo/societe/12/logos/thumbs/pierrecurie_small.jpg
    A dev/initdemo/documents_demo/societe/12/radiography1.jpg
    A dev/initdemo/documents_demo/societe/12/radiography2-knee.jpg
    A dev/initdemo/documents_demo/societe/12/thumbs/radiography1_mini.jpg
    A dev/initdemo/documents_demo/societe/12/thumbs/radiography1_small.jpg
    A dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_mini.jpg
    A dev/initdemo/documents_demo/societe/12/thumbs/radiography2-knee_small.jpg
    M dev/initdemo/documents_demo/users/11/person4.jpeg
    M dev/initdemo/documents_demo/users/12/person6.jpeg
    M dev/initdemo/documents_demo/users/13/person7.jpeg
    M dev/initdemo/documents_demo/users/14/person3.jpeg
    M dev/initdemo/documents_demo/users/16/person1.jpeg
    M dev/initdemo/documents_demo/users/17/person5.jpeg
    M dev/initdemo/documents_demo/users/19/person2.jpeg
    M dev/initdemo/documents_demo/users/2/person9.jpeg
    M dev/initdemo/documents_demo/users/4/person8.jpeg
    M dev/initdemo/savedemo.sh
    M htdocs/langs/en_US/website.lang
    M htdocs/ticket/list.php
    M htdocs/user/class/user.class.php
    M htdocs/website/index.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cdb045366191...2e2c9562e880