Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

751488e2

Commit 751488e2 authored 12 years ago by Frédéric France

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into develop

parents de4bc7f3 4f1c4f03

Branches

Tags

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

htdocs/comm/propal.php 1 addition, 1 deletion

htdocs/comm/propal.php
htdocs/societe/canvas/actions_card_common.class.php 0 additions, 2 deletions

htdocs/societe/canvas/actions_card_common.class.php
htdocs/societe/class/societe.class.php 2 additions, 7 deletions

htdocs/societe/class/societe.class.php
htdocs/societe/soc.php 0 additions, 34 deletions

htdocs/societe/soc.php

with 3 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