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
..
2011-08-12 02:13:23 -04:00
2012-03-06 16:08:28 -04:00
2012-05-30 18:37:43 -04:00
2012-01-08 04:54:15 -04:00
2011-08-18 02:41:10 -04:00
2012-05-23 00:23:39 -04:00
2012-04-11 03:11:08 -04:00
2012-03-27 23:11:15 -04:00
2012-05-24 02:41:45 -04:00
2012-01-18 13:52:19 -04:00
2012-02-11 21:13:05 -04:00
2011-05-06 00:46:33 -04:00
2012-01-18 13:52:19 -04:00
2012-01-26 22:42:36 -04:00
2012-06-03 22:50:33 -04:00
2012-02-02 15:37:06 -04:00
2012-01-18 13:52:19 -04:00
2012-01-18 13:52:19 -04:00