Merge branch 'hotfix/v0.11.2' into development

Browse Source

Conflicts:
	apps/documents/statistics.py
	docs/changelog.rst

...

This commit is contained in:

Roberto Rosario

2012-02-02 05:23:17 -04:00

parent 1c8fd9e212 c117a907e4

commit f8e2341f4f

5 changed files with 724 additions and 6 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

716

docs/changelog.rst Normal file

File diff suppressed because it is too large Load Diff