diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-10 19:53:37 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-10 19:53:37 -0500 |
| commit | 852d5bb2387706c11925fa0c2abe4a1f34708f16 (patch) | |
| tree | df5e6a3108d2ba007112b558ff65bbfabd88020c /.gitignore | |
| parent | 6b9ee0ca13b99ee20f9d0c680a950c6a7494a5a0 (diff) | |
| parent | 6d794f268bb1f5d3cc56c5f0dc902571d48ebeac (diff) | |
| download | mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.tar.lz mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.tar.xz mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.zip | |
Merge branch 'master' into processing
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -10,7 +10,8 @@ mediagoblin.egg-info *.pyo docs/_build/ user_dev/ -mediagoblin_user.ini +paste_local.ini +mediagoblin_local.ini server-log.txt *~ *.swp |