Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

fbc0b5b3

Commit fbc0b5b3 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php

parents 9e1c1fd4 5c2059a7

No related branches found

No related tags found

No related merge requests found

Changes 13

Show whitespace changes

Inline Side-by-side

Showing

ChangeLog 4 additions, 0 deletions

ChangeLog
htdocs/compta/facture/stats/index.php 8 additions, 1 deletion

htdocs/compta/facture/stats/index.php
htdocs/compta/prelevement/class/rejetprelevement.class.php 20 additions, 11 deletions

htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/contact/exportimport.php 50 additions, 50 deletions

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

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

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

htdocs/contact/perso.php
htdocs/contact/vcard.php 52 additions, 48 deletions

htdocs/contact/vcard.php
htdocs/core/class/html.form.class.php 1 addition, 1 deletion

htdocs/core/class/html.form.class.php
htdocs/core/class/vcard.class.php 1 addition, 1 deletion

htdocs/core/class/vcard.class.php
htdocs/societe/consumption.php 1 addition, 1 deletion

htdocs/societe/consumption.php
htdocs/societe/info.php 15 additions, 13 deletions

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

htdocs/societe/soc.php

with 431 additions and 391 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