projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 731224a d1ac2d5)
Merge branch 'master' into stable
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 29 Mar 2016 19:18:42 +0000 (12:18 -0700)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 29 Mar 2016 19:18:42 +0000 (12:18 -0700)

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