Files
mayan-edms/apps/common
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
2011-08-18 02:41:10 -04:00
2012-03-27 23:11:15 -04:00
2011-05-06 00:46:33 -04:00