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

..

__init__.py

Import base.py by default

2014-07-11 01:15:51 -04:00

base.py

Merge branch 'feature/lts' into merge_test

2014-10-03 11:41:41 -04:00

development_ddt.py

Add the Django debug toolbar middleware at the beginning as per the docs

2014-07-11 02:47:56 -04:00

development.py

Separate development settings file into two, with and without Django Debug Toolbar

2014-07-11 00:39:58 -04:00

local.py

Reset the local.py settings file

2014-10-01 05:17:41 -04:00

production.py

Fix typo

2014-08-27 01:34:08 -04:00