Roberto Rosario
|
080d68c169
|
Merge branch 'hotfix/v0.12.2' into development
Conflicts:
apps/common/__init__.py
apps/documents/forms.py
apps/feedback/__init__.py
apps/history/__init__.py
apps/main/__init__.py
apps/scheduler/api.py
apps/sources/models.py
docs/releases/index.rst
requirements/production.txt
settings.py
urls.py
|
2012-06-30 04:00:01 -04:00 |
|