Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source

Conflicts:
	COPYRIGHT
	dev/initdata/mysqldump_dolibarr_3.3.0.sql
	htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.min.js

...

This commit is contained in:

Laurent Destailleur

2013-09-11 21:54:57 +02:00

parent 30d2af26f8 d6c35c1ee7

commit 301187a117

8 changed files with 39672 additions and 477 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3357

htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.css Normal file

File diff suppressed because it is too large Load Diff

11092

htdocs/includes/jquery/plugins/mobile/jquery.mobile-latest.js Normal file

File diff suppressed because it is too large Load Diff