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

..

__init__.py

Initial changes to support the new Django 1.6 project structure

2014-06-15 13:13:21 +02:00

graphicsmagick.py

Merge branch 'feature/remove_non_essentials' into development

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

imagemagick.py

Merge branch 'feature/remove_non_essentials' into development

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

python.py

Issue #56, Remove the "Supported File Format" list view, messages and related code

2014-10-01 22:19:08 -04:00