diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
commit | 0b39716196977f9a368cfded6a1d05244ca724d0 (patch) | |
tree | fd1a31f04a866cab270a7c4ea846206782009823 /django_authopenid/middleware.py | |
parent | 02409029d958cced911b3b18e025cf495656cb04 (diff) | |
parent | 8d5ef067c8c4e7de276d559af67417f5324f9171 (diff) | |
download | askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.gz askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.bz2 askbot-0b39716196977f9a368cfded6a1d05244ca724d0.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/auth.py
forum/models.py
forum/views.py
Diffstat (limited to 'django_authopenid/middleware.py')
-rw-r--r-- | django_authopenid/middleware.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django_authopenid/middleware.py b/django_authopenid/middleware.py index c0572c6e..2900d54c 100644 --- a/django_authopenid/middleware.py +++ b/django_authopenid/middleware.py @@ -21,4 +21,4 @@ class OpenIDMiddleware(object): mimeparse.best_match(['text/html', 'application/xrds+xml'], request.META['HTTP_ACCEPT']) == 'application/xrds+xml': return HttpResponseRedirect(reverse('yadis_xrdf')) - return response
\ No newline at end of file + return response |