projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cabbd95 79a97f6)
Merge branch 'permission_scheme'
authortilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 18:47:19 +0000 (14:47 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 18:47:19 +0000 (14:47 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.