Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5a29b3d5

Commit 5a29b3d5 authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/societe/soc.php

parents 3ea8af95 4915ec89

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
htdocs/core/class/html.formmail.class.php 5 additions, 4 deletions

htdocs/core/class/html.formmail.class.php
htdocs/langs/en_US/other.lang 9 additions, 8 deletions

htdocs/langs/en_US/other.lang
htdocs/langs/fr_FR/other.lang 9 additions, 8 deletions

htdocs/langs/fr_FR/other.lang
htdocs/societe/soc.php 73 additions, 73 deletions

htdocs/societe/soc.php
htdocs/theme/cameleo/style.css.php 1 addition, 1 deletion

htdocs/theme/cameleo/style.css.php

with 99 additions and 94 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