Commit Graph

8 Commits

Author SHA1 Message Date
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
Roberto Rosario
001f7f1695 Remove cyrillic characters from doc utils makepdf error is resolved 2012-06-03 22:37:02 -04:00
Roberto Rosario
7bc61e0cff Documentation update 2012-05-30 18:53:08 -04:00
Roberto Rosario
a65031dab5 Add Haystack to the list of software used 2012-05-22 23:46:10 -04:00
Roberto Rosario
144540de9d Update credits and release notes to add mic and Polish translation 2012-02-22 16:15:01 -04:00
Roberto Rosario
05fdd47fee Documentation update 2012-02-21 01:47:19 -04:00
Roberto Rosario
cc3525366c Add Michael Terretta to the contributors file 2012-02-13 02:13:48 -04:00
Roberto Rosario
f94f997883 Documentation updates, indexed documentation 2012-02-11 21:13:05 -04:00