Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

ac2c7c4f

Commit ac2c7c4f authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'BadPixxel-develop' into develop

parents eb41fc27 58c06264

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/categories/class/categorie.class.php 15 additions, 4 deletions

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

htdocs/categories/photos.php
htdocs/langs/en_US/categories.lang 2 additions, 1 deletion

htdocs/langs/en_US/categories.lang
htdocs/langs/fr_FR/categories.lang 1 addition, 0 deletions

htdocs/langs/fr_FR/categories.lang

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