Roberto Rosario
c24a3f935e
Merge branch 'hotfix/v0.12.1' into development
Conflicts:
apps/converter/conf/settings.py
apps/documents/__init__.py
apps/main/__init__.py
apps/metadata/__init__.py
apps/navigation/templatetags/navigation_tags.py
apps/ocr/__init__.py
apps/ocr/conf/settings.py
docs/intro/installation.rst
docs/releases/index.rst
requirements/production.txt
2012-06-03 22:50:33 -04:00
..
2012-03-06 16:08:28 -04:00
2012-05-30 18:37:43 -04:00
2012-05-29 23:54:07 -04:00
2011-12-04 01:11:12 -04:00
2012-04-09 07:41:03 -04:00
2011-12-04 02:37:11 -04:00
2012-05-29 03:32:33 -04:00
2012-01-18 14:37:15 -04:00
2012-05-24 02:50:02 -04:00
2012-05-23 16:11:48 -04:00
2012-01-02 03:48:26 -04:00
2012-02-05 23:27:03 -04:00
2012-06-03 22:50:33 -04:00
2012-01-03 04:26:31 -04:00
2012-05-29 02:46:30 -04:00
2012-01-18 13:52:19 -04:00
2012-01-18 13:52:19 -04:00
2012-05-30 12:56:56 -04:00
2012-06-03 22:50:33 -04:00
2012-03-14 15:25:35 -04:00
2012-03-04 20:30:40 -04:00