lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
This commit is contained in:
Laurent Destailleur 2013-06-05 18:56:41 +02:00
commit e25651204c
164 changed files with 4492 additions and 4491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ doxygen_warnings.log
/.project /.project
.DS_Store .DS_Store
.idea .idea
*.iml