Christopher Allan Webber f6bad0eb26 Merge branch 'master' into merge-python3-port ...

Has some issues, will iteratively fix!

Conflicts:
	mediagoblin/gmg_commands/__init__.py
	mediagoblin/gmg_commands/deletemedia.py
	mediagoblin/gmg_commands/users.py
	mediagoblin/oauth/views.py
	mediagoblin/plugins/api/views.py
	mediagoblin/tests/test_api.py
	mediagoblin/tests/test_edit.py
	mediagoblin/tests/test_oauth1.py
	mediagoblin/tests/test_util.py
	mediagoblin/tools/mail.py
	mediagoblin/webfinger/views.py
	setup.py

2014-09-16 14:01:43 -05:00

..

__init__.py

In this commit I made it so that each deployment can have custom settings for

2014-04-28 16:37:46 -04:00

routing.py

moved forgot pass to basic_auth plugin

2013-08-16 10:28:47 -07:00

tools.py

Merge branch 'master' into merge-python3-port

2014-09-16 14:01:43 -05:00

views.py

Use six.text_type instead of unicode().

2014-06-02 20:59:28 +03:00