These are the updates I made today:
address@hidden:/srv/dolibarr# git fetch
remote: Counting objects: 60, done.
remote: Compressing objects: 100% (48/48), done.
remote: Total 60 (delta 53), reused 19 (delta 12), pack-reused 0
Unpacking objects: 100% (60/60), done.
From
https://github.com/Dolibarr/dolibarr 486a372..f78cf68 develop -> origin/develop
address@hidden:/srv/dolibarr# git merge
Updating 486a372..f78cf68
Fast-forward
htdocs/adherents/card.php | 16 ++--------------
htdocs/core/class/commonobject.class.php | 22 ++++++++++++++++------
htdocs/core/class/extrafields.class.php | 26 +++++++++++++-------------
htdocs/core/tpl/admin_extrafields_edit.tpl.php | 2 +-
htdocs/install/mysql/migration/7.0.0-8.0.0.sql | 2 ++
htdocs/install/mysql/tables/llx_extrafields.sql | 2 +-
htdocs/langs/en_US/admin.lang | 2 +-
htdocs/langs/en_US/agenda.lang | 2 +-
htdocs/langs/en_US/bills.lang | 8 ++++----
htdocs/langs/en_US/cron.lang | 4 ++--
htdocs/langs/en_US/main.lang | 4 ++--
htdocs/public/members/new.php | 27 ++++++++++-----------------
htdocs/societe/class/companypaymentmode.class.php | 5 +++--
htdocs/ticketsup/class/actions_ticketsup.class.php | 2 +-
htdocs/ticketsup/class/ticketsup.class.php | 24 ++++++++++++------------
htdocs/ticketsup/list.php | 8 ++++----
16 files changed, 75 insertions(+), 81 deletions(-)
address@hidden:/srv/dolibarr# rm ../documents-dolibarr/install.lock
address@hidden:/srv/dolibarr# touch ../documents-dolibarr/install.lock
address@hidden:/srv/dolibarr# git fetch
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 6 (delta 5), reused 6 (delta 5), pack-reused 0
Unpacking objects: 100% (6/6), done.
From
https://github.com/Dolibarr/dolibarr f78cf68..28d8acb develop -> origin/develop
address@hidden:/srv/dolibarr# git merge
Updating f78cf68..28d8acb
Fast-forward
htdocs/modulebuilder/template/myobject_list.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)