Skip to content

Commit

Permalink
Merge branch 'GPCsolutions-composer' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed May 4, 2014
2 parents d584d29 + 2bba726 commit 2c8e984
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -54,6 +54,7 @@ For users:
- New: Add categories translation.
- New: Enable option "clone target emailing".
- New: Improved tax module: Add specific page for salaries payment
- New: Add composer.json file so Dolibarr can be publish onto packagist.org.

TODO
- New: Predefined product and free product use same form.
Expand Down
11 changes: 8 additions & 3 deletions composer.json
Expand Up @@ -2,9 +2,14 @@
"name": "dolibarr/dolibarr",
"type": "project",
"description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
"keywords": ["erp","crm"],
"keywords": ["erp","crm","invoice","sme","proposal","order","stock"],
"homepage": "http://www.dolibarr.org",
"licence": "GPL-3.0+",
"license": "GPL-3.0+",
"support": {
"issues": "https://doliforge.org/projects/dolibarr",
"forum": "http://www.dolibarr.org/forum",
"wiki": "http://wiki.dolibarr.org"
},
"require": {
"php": ">=5.3.0",
"ext-gd": "*",
Expand All @@ -18,7 +23,7 @@
"ext-imagick": "*",
"ext-mcrypt": "*",
"ext-openssl": "*",
"ext-mb_string": "*",
"ext-mbstring": "*",
"ext-soap": "*"
}
}

0 comments on commit 2c8e984

Please sign in to comment.