projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cac17c1 6f6471a)
Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:06:53 +0000 (13:06 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Feb 2013 19:06:53 +0000 (13:06 -0600)
1  2 
mediagoblin/config_spec.ini patch | diff1 | diff2 | blob | history

diff --cc mediagoblin/config_spec.ini
Simple merge
Unnamed repository; edit this file 'description' to name the repository.