Roberto Rosario 9012a1101a Merge branch 'feature/remove_non_essentials' into development ...

Conflicts:
	mayan/apps/converter/__init__.py
	mayan/apps/converter/api.py
	mayan/apps/converter/views.py
	mayan/urls.py

2014-10-01 22:22:06 -04:00

4.1 KiB

Raw Blame History

View Raw