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-05-30 18:37:43 -04:00
2012-01-18 14:36:42 -04:00
2012-03-14 22:17:45 -04:00
2012-03-16 20:09:35 -04:00
2011-12-25 16:07:45 -04:00
2012-02-22 11:57:00 -04:00
2012-02-14 14:26:58 -04:00
2012-03-14 22:17:45 -04:00
2012-03-14 22:17:45 -04:00
2012-03-14 22:17:45 -04:00