Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

e704e037

Commit e704e037 authored 9 years ago by Florian Henry

Downloads
- Plain Diff

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

parents db2acb7c e4656ecf

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/comm/card.php 1 addition, 1 deletion

htdocs/comm/card.php
htdocs/comm/index.php 97 additions, 0 deletions

htdocs/comm/index.php
htdocs/core/class/commonobject.class.php 14 additions, 13 deletions

htdocs/core/class/commonobject.class.php
htdocs/core/menus/standard/eldy.lib.php 3 additions, 3 deletions

htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modResource.class.php 2 additions, 3 deletions

htdocs/core/modules/modResource.class.php
htdocs/core/tpl/resource_view.tpl.php 1 addition, 1 deletion

htdocs/core/tpl/resource_view.tpl.php
htdocs/resource/element_resource.php 17 additions, 16 deletions

htdocs/resource/element_resource.php

with 135 additions and 37 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