projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d9d9f1 85cf52f)
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Thu, 5 Sep 2013 17:15:10 +0000 (22:45 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Thu, 5 Sep 2013 17:15:10 +0000 (22:45 +0530)
1  2 
mediagoblin/processing/__init__.py patch | diff1 | diff2 | blob | history

diff --cc mediagoblin/processing/__init__.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.