Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

53bf90a3

Commit 53bf90a3 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
	ChangeLog

parents ebe1f4a7 b0071a7c

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 2 deletions

ChangeLog
build/makepack-howto.txt 2 additions, 2 deletions

build/makepack-howto.txt
htdocs/comm/propal.php 4 additions, 2 deletions

htdocs/comm/propal.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql 1 addition, 1 deletion

htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_US/admin.lang 1 addition, 1 deletion

htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/mails.lang 2 additions, 2 deletions

htdocs/langs/en_US/mails.lang

with 12 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment