Files
mayan-edms/apps/common
Roberto Rosario 080d68c169 Merge branch 'hotfix/v0.12.2' into development
Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py
2012-06-30 04:00:01 -04:00
..
2011-08-12 02:13:23 -04:00
2012-06-17 19:14:23 -04:00
2011-08-18 02:41:10 -04:00
2011-05-06 00:46:33 -04:00
2012-06-08 16:43:54 -04:00