Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e95160c2

Commit e95160c2 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

Conflicts:
	htdocs/user/agenda_extsites.php

parents 4d7f3cb7 f1ec0348

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/action/class/actioncomm.class.php 4 additions, 1 deletion

htdocs/comm/action/class/actioncomm.class.php
htdocs/societe/soc.php 11 additions, 13 deletions

htdocs/societe/soc.php
htdocs/support/default.css 8 additions, 0 deletions

htdocs/support/default.css
htdocs/theme/eldy/style.css.php 4 additions, 4 deletions

htdocs/theme/eldy/style.css.php
htdocs/user/agenda_extsites.php 6 additions, 5 deletions

htdocs/user/agenda_extsites.php

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