Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

3b70bbb0

Commit 3b70bbb0 authored 9 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
	htdocs/core/lib/admin.lib.php

parents 215b24df 7fbfbfc8

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/categories/class/categorie.class.php 1 addition, 1 deletion

htdocs/categories/class/categorie.class.php
htdocs/comm/card.php 21 additions, 12 deletions

htdocs/comm/card.php
htdocs/compta/prelevement/class/bonprelevement.class.php 7 additions, 9 deletions

htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/lib/admin.lib.php 17 additions, 21 deletions

htdocs/core/lib/admin.lib.php
htdocs/fourn/facture/list.php 1 addition, 1 deletion

htdocs/fourn/facture/list.php
htdocs/product/admin/product.php 3 additions, 1 deletion

htdocs/product/admin/product.php
htdocs/projet/activity/index.php 3 additions, 3 deletions

htdocs/projet/activity/index.php

with 53 additions and 48 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