Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

a42ad74a

Commit a42ad74a authored 8 years ago by Laurent Destailleur

Downloads
- Plain Diff

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

parents b4c97e22 64da0e77

No related branches found

No related tags found

No related merge requests found

Changes 1000

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 8 additions, 3 deletions

.travis.yml
ChangeLog 179 additions, 1 deletion

ChangeLog
README-FR.md 6 additions, 13 deletions

README-FR.md
README.md 16 additions, 6 deletions

README.md
build/debian/README.howto 5 additions, 3 deletions

build/debian/README.howto
build/debian/control 2 additions, 2 deletions

build/debian/control
build/generate_filelist_xml.php 20 additions, 2 deletions

build/generate_filelist_xml.php
dev/initdemo/initdemo.sh 2 additions, 2 deletions

dev/initdemo/initdemo.sh
dev/resources/iso-normes/sample_FEC_file.txt 13 additions, 0 deletions

dev/resources/iso-normes/sample_FEC_file.txt
dev/setup/nginx/dolibarr 28 additions, 0 deletions

dev/setup/nginx/dolibarr
dev/skeletons/build_class_from_table.php 2 additions, 2 deletions

dev/skeletons/build_class_from_table.php
dev/skeletons/skeleton_class.class.php 5 additions, 7 deletions

dev/skeletons/skeleton_class.class.php
dev/skeletons/skeleton_list.php 6 additions, 2 deletions

dev/skeletons/skeleton_list.php
dev/tools/fixaltlanguages.sh 5 additions, 1 deletion

dev/tools/fixaltlanguages.sh
dev/tools/fixdosfiles.sh 2 additions, 2 deletions

dev/tools/fixdosfiles.sh
dev/tools/github_authors_peryear.sh 8 additions, 0 deletions

dev/tools/github_authors_peryear.sh
dev/tools/github_commits_perversion.sh 15 additions, 0 deletions

dev/tools/github_commits_perversion.sh
dev/tools/test/testdiv.php 2 additions, 2 deletions

dev/tools/test/testdiv.php
dev/translation/erp_comparison_translation.txt 14 additions, 0 deletions

dev/translation/erp_comparison_translation.txt
htdocs/accountancy/admin/account.php 143 additions, 75 deletions

htdocs/accountancy/admin/account.php

with 481 additions and 123 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

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