Files
mayan-edms/apps
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
..
2012-02-22 16:14:40 -04:00
2012-02-22 11:55:48 -04:00
2012-02-27 12:57:11 -04:00
2012-02-22 16:14:40 -04:00
2012-02-22 16:14:40 -04:00
2012-02-22 11:55:48 -04:00
2012-02-22 16:14:40 -04:00
2012-02-06 14:56:27 -04:00
2012-02-27 12:50:46 -04:00
2012-02-22 11:57:00 -04:00
2012-02-27 12:57:11 -04:00
2012-02-22 11:55:48 -04:00
2012-02-22 11:55:48 -04:00
2012-02-22 11:57:00 -04:00
2012-02-22 11:55:48 -04:00