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
..
2012-06-17 19:14:23 -04:00
2011-08-18 11:24:25 -04:00
2012-06-17 16:54:53 -04:00
2012-06-28 14:55:05 -04:00
2012-01-02 03:48:26 -04:00
2012-06-30 04:00:01 -04:00
2011-05-26 05:07:26 -04:00
2012-06-17 16:49:24 -04:00
2012-01-03 03:28:17 -04:00
2011-05-26 05:07:26 -04:00
2012-06-17 16:49:24 -04:00
2012-06-17 16:49:24 -04:00
2012-06-17 16:49:24 -04:00