Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

94d3e6d3

Commit 94d3e6d3 authored Aug 24, 2013 by Laurent Destailleur

Downloads
- Plain Diff

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

develop

Conflicts:
	htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php

parents 70f7321d 07cba2d2

No related branches found

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

htdocs/admin/contract.php 331 additions, 15 deletions

htdocs/admin/contract.php
htdocs/contrat/admin/contract_extrafields.php 159 additions, 0 deletions

htdocs/contrat/admin/contract_extrafields.php
htdocs/core/lib/contract.lib.php 35 additions, 0 deletions

htdocs/core/lib/contract.lib.php
htdocs/core/modules/contract/doc/pdf_strato.modules.php 609 additions, 0 deletions

htdocs/core/modules/contract/doc/pdf_strato.modules.php
htdocs/core/modules/contract/modules_contract.php 140 additions, 1 deletion

htdocs/core/modules/contract/modules_contract.php
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php 7 additions, 7 deletions

.../interface_50_modMailmanspip_Mailmanspipsynchro.class.php
htdocs/langs/fr_FR/admin.lang 3 additions, 0 deletions

htdocs/langs/fr_FR/admin.lang

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