Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
0d1d68d5
Commit
0d1d68d5
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts: htdocs/admin/dict.php htdocs/product/price.php
parents
0e7da2cd
74e00c4d
Branches
Branches containing commit
No related tags found
Loading
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/core/class/CMailFile.class.php
+7
-5
7 additions, 5 deletions
htdocs/core/class/CMailFile.class.php
htdocs/core/class/smtps.class.php
+3
-1
3 additions, 1 deletion
htdocs/core/class/smtps.class.php
with
10 additions
and
6 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
