Files
mayan-edms/apps/documents/models.py
Roberto Rosario 84c47d4ab6 Merge branch 'release/v0.12'
Conflicts:
	apps/documents/models.py
	apps/history/api.py
	apps/ocr/__init__.py
2012-02-27 12:57:11 -04:00

24 KiB