Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

c7d73637

Commit c7d73637 authored 7 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents 1a6c118a e096974b

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/adherents/subscription.php 3 additions, 3 deletions

htdocs/adherents/subscription.php
htdocs/comm/propal/class/api_proposals.class.php 5 additions, 4 deletions

htdocs/comm/propal/class/api_proposals.class.php
htdocs/core/class/ctyperesource.class.php 500 additions, 0 deletions

htdocs/core/class/ctyperesource.class.php
htdocs/core/lib/pdf.lib.php 20 additions, 4 deletions

htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modResource.class.php 56 additions, 107 deletions

htdocs/core/modules/modResource.class.php
htdocs/langs/en_US/resource.lang 5 additions, 0 deletions

htdocs/langs/en_US/resource.lang

with 589 additions and 118 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