projects
/
mediagoblin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce26346
0a5981f
)
Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin...
author
tilly-Q
<nattilypigeonfowl@gmail.com>
Thu, 1 May 2014 18:28:11 +0000
(14:28 -0400)
committer
tilly-Q
<nattilypigeonfowl@gmail.com>
Thu, 1 May 2014 18:28:11 +0000
(14:28 -0400)
Conflicts:
mediagoblin.ini
mediagoblin/auth/tools.py
mediagoblin/config_spec.ini
Trivial merge
projects / mediagoblin.git / commitdiff