Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

b47dbc7a

Commit b47dbc7a authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php

parents 995db611 1608fec9

Branches master

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

dev/codesniffer/ruleset.xml 9 additions, 6 deletions

dev/codesniffer/ruleset.xml
htdocs/comm/mailing/class/mailing.class.php 1 addition, 1 deletion

htdocs/comm/mailing/class/mailing.class.php
htdocs/core/boxes/modules_boxes.php 4 additions, 1 deletion

htdocs/core/boxes/modules_boxes.php
htdocs/core/class/dolgeoip.class.php 3 additions, 6 deletions

htdocs/core/class/dolgeoip.class.php
htdocs/core/class/html.formprojet.class.php 12 additions, 2 deletions

htdocs/core/class/html.formprojet.class.php
htdocs/fourn/class/fournisseur.commande.class.php 2 additions, 1 deletion

htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/pgsql/functions/functions.sql 44 additions, 2 deletions

htdocs/install/pgsql/functions/functions.sql
htdocs/langs/en_US/mails.lang 1 addition, 1 deletion

htdocs/langs/en_US/mails.lang
htdocs/product/card.php 0 additions, 1 deletion

htdocs/product/card.php
htdocs/projet/element.php 21 additions, 18 deletions

htdocs/projet/element.php
htdocs/theme/eldy/style.css.php 6 additions, 5 deletions

htdocs/theme/eldy/style.css.php

with 103 additions and 44 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