diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-01 14:28:11 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-01 14:28:11 -0400 |
| commit | 79a97f6bc370a2053d9335f0a635ff55a7a023a3 (patch) | |
| tree | e71a6d969babed6bfcd94ebc23cb9994291c03e6 | |
| parent | ce26346a4c17a6e0b81ddd12046f67c4beaa8143 (diff) | |
| parent | 0a5981fd5416c60858c3e460f943692d1c62629d (diff) | |
| download | mediagoblin-79a97f6bc370a2053d9335f0a635ff55a7a023a3.tar.lz mediagoblin-79a97f6bc370a2053d9335f0a635ff55a7a023a3.tar.xz mediagoblin-79a97f6bc370a2053d9335f0a635ff55a7a023a3.zip | |
Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin into permission_scheme
Conflicts:
mediagoblin.ini
mediagoblin/auth/tools.py
mediagoblin/config_spec.ini
0 files changed, 0 insertions, 0 deletions