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

..

features.rst

Update credits and release notes to add mic and Polish translation

2012-02-22 16:15:01 -04:00

index.rst

Documentation updates, indexed documentation

2012-02-11 21:13:05 -04:00

installation.rst

Merge branch 'hotfix/v0.12.1' into development

2012-06-03 22:50:33 -04:00

overview.rst

Documentation updates

2012-02-01 13:43:24 -04:00

requirements.rst

Documentation updates

2012-02-01 13:43:24 -04:00