diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 08:25:22 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 08:25:22 -0700 |
| commit | bcd10ad6633d90b5feae4f5dec8cf5d5754d51b5 (patch) | |
| tree | 23dce33e5deaf33340f25d816ec309e39560d305 /mediagoblin/plugins/basic_auth/lib.py | |
| parent | f339b76a4ee04571bd0a94d20a5d53d7f3d8d235 (diff) | |
| parent | 1d321f1c7158f3bd263d64ae703311e8d8e2a22a (diff) | |
| download | mediagoblin-bcd10ad6633d90b5feae4f5dec8cf5d5754d51b5.tar.lz mediagoblin-bcd10ad6633d90b5feae4f5dec8cf5d5754d51b5.tar.xz mediagoblin-bcd10ad6633d90b5feae4f5dec8cf5d5754d51b5.zip | |
Merge branch 'pre-auth' into basic_auth
Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/plugins/basic_auth/lib.py
mediagoblin/plugins/httpapiauth/__init__.py
mediagoblin/plugins/piwigo/views.py
Diffstat (limited to 'mediagoblin/plugins/basic_auth/lib.py')
0 files changed, 0 insertions, 0 deletions