Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php

...

This commit is contained in:

Laurent Destailleur 2015-03-01 13:58:56 +01:00

parent be033c1947 7ca8fdb20c

commit 9b0dce2e34

1 changed files with 1 additions and 1 deletions

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

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