Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

a9721992

Commit a9721992 authored 12 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 38b1c540 7c19fc97

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/contact/fiche.php 12 additions, 11 deletions

htdocs/contact/fiche.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql 3 additions, 0 deletions

htdocs/install/mysql/migration/3.2.0-3.3.0.sql
htdocs/install/mysql/tables/llx_holiday.sql 1 addition, 0 deletions

htdocs/install/mysql/tables/llx_holiday.sql
htdocs/langs/fr_FR/companies.lang 1 addition, 1 deletion

htdocs/langs/fr_FR/companies.lang
htdocs/main.inc.php 2 additions, 0 deletions

htdocs/main.inc.php

with 19 additions and 12 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