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

Whew. This is a big update. I did some significant keeping work. I moved all of

2013-07-17 16:16:07 -04:00

forms.py

Make translatable the titles of TextAreas in moderation form

2014-07-29 11:00:37 -05:00

routing.py

This is a quick commit. I gave admins the ability to ban or unban users

2013-08-29 17:31:19 -04:00

tools.py

Merge branch 'master' into merge-python3-port

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

views.py

This commit was solely to remove unused imports in the code that I have written

2013-09-23 14:10:11 -04:00