Files
mayan-edms/mayan/apps/user_management
Roberto Rosario 3b03af9295 Merge branch 'feature/lts' into merge_test
Conflicts:
	mayan/apps/documents/api_views.py
	mayan/apps/documents/models.py
	mayan/apps/folders/__init__.py
	mayan/apps/folders/urls.py
	mayan/apps/folders/views.py
	mayan/apps/tags/urls.py
	mayan/apps/tags/views.py
	mayan/settings/base.py
2014-10-03 11:41:41 -04:00
..
2014-09-26 13:54:49 +08:00
2014-09-21 19:23:37 -04:00
2014-09-21 19:23:37 -04:00
2014-09-21 19:23:37 -04:00