Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

a658b7cc

Commit a658b7cc authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	ChangeLog
	htdocs/comm/card.php

parents 90b138a5 ffe4ae59

No related branches found

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 25 additions, 0 deletions

ChangeLog
build/makepack-dolibarr.pl 13 additions, 7 deletions

build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec 1 addition, 1 deletion

build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec 1 addition, 1 deletion

build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec 1 addition, 1 deletion

build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec 1 addition, 1 deletion

build/rpm/dolibarr_opensuse.spec
htdocs/admin/dict.php 4 additions, 2 deletions

htdocs/admin/dict.php
htdocs/admin/websites.php 6 additions, 4 deletions

htdocs/admin/websites.php
htdocs/comm/card.php 3 additions, 3 deletions

htdocs/comm/card.php
htdocs/core/lib/functions.lib.php 16 additions, 2 deletions

htdocs/core/lib/functions.lib.php
test/phpunit/FunctionsLibTest.php 27 additions, 1 deletion

test/phpunit/FunctionsLibTest.php

with 98 additions and 23 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