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-01 17:04:33 -04:00
2011-08-19 15:00:55 -04:00
2012-06-03 22:50:33 -04:00
2012-02-12 17:12:42 -04:00
2012-02-21 11:44:45 -04:00
2012-06-03 22:50:33 -04:00
2012-06-03 22:50:33 -04:00
2012-06-03 22:50:33 -04:00
2012-05-29 03:18:08 -04:00
2012-02-26 16:49:46 -04:00
2012-05-29 03:07:12 -04:00
2011-08-19 08:58:54 -04:00
2011-08-19 08:58:54 -04:00