diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 09:04:53 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-05-27 09:04:53 -0700 |
| commit | 0ccc722ddc2fabcd57b0a9b72d474feb5b312052 (patch) | |
| tree | e8abe3c17147d72e003eddcc7fb8847a25dbbddf /setup.py | |
| parent | 3b8c733b98533e6dd7612f071b672b19a97ecf1e (diff) | |
| parent | f855efff87c22ddb6b2a7ad690933de02ddfbc62 (diff) | |
| download | mediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.tar.lz mediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.tar.xz mediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.zip | |
Merge branch 'pre-auth' into basic_auth
Conflicts:
mediagoblin/auth/tools.py
mediagoblin/auth/views.py
mediagoblin/plugins/basic_auth/tools.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions