Files
mayan-edms/apps/ocr
Roberto Rosario 4abb3c5ebc Merge branch 'new_metadata'
Conflicts:
	requirements/development.txt
	requirements/production.txt
	settings.py
2011-05-21 00:13:38 -04:00
..
2011-05-19 22:55:57 -04:00
2011-03-07 12:15:25 -04:00
2011-05-20 03:58:02 -04:00