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-02-14 16:36:59 -04:00
2012-06-03 22:50:33 -04:00
2012-05-30 18:37:43 -04:00
2011-08-18 11:24:25 -04:00
2011-06-19 20:16:46 -04:00
2012-03-16 21:42:03 -04:00
2012-05-31 01:42:01 -04:00
2012-01-18 14:37:15 -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