Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

a1f74763

Commit a1f74763 authored 9 years ago by Marcos García de La Fuente

Downloads
- Plain Diff

Merge branch '3.5' into bug-3206

Conflicts:
	ChangeLog

parents d0b1652e 6b2d7f7d

No related branches found

No related tags found

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 4 additions, 0 deletions

ChangeLog
htdocs/comm/propal/class/propal.class.php 2 additions, 1 deletion

htdocs/comm/propal/class/propal.class.php
htdocs/contact/exportimport.php 50 additions, 51 deletions

htdocs/contact/exportimport.php
htdocs/contact/info.php 13 additions, 10 deletions

htdocs/contact/info.php
htdocs/contact/ldap.php 111 additions, 107 deletions

htdocs/contact/ldap.php
htdocs/contact/perso.php 153 additions, 151 deletions

htdocs/contact/perso.php
htdocs/contact/vcard.php 51 additions, 49 deletions

htdocs/contact/vcard.php
htdocs/core/menus/standard/eldy.lib.php 5 additions, 3 deletions

htdocs/core/menus/standard/eldy.lib.php
htdocs/societe/info.php 15 additions, 14 deletions

htdocs/societe/info.php
htdocs/societe/soc.php 2 additions, 0 deletions

htdocs/societe/soc.php

with 406 additions and 386 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