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-02-14 16:36:59 -04:00
2012-06-03 22:50:33 -04:00
2012-06-17 19:14:23 -04:00
2011-08-18 11:24:25 -04:00
2011-06-19 20:16:46 -04:00
2012-06-08 17:40:57 -04:00
2012-05-31 01:42:01 -04:00
2012-01-18 14:37:15 -04:00
2012-06-08 17:40:57 -04:00
2012-01-18 14:37:15 -04:00
2011-03-07 12:15:25 -04:00
2012-05-31 01:41:25 -04:00
2012-01-02 03:48:26 -04:00
2012-01-18 14:37:15 -04:00
2011-06-18 00:51:32 -04:00
2012-05-30 12:56:56 -04:00
2012-01-08 07:36:32 -04:00