diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-08-08 20:00:57 +0200 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-08-08 20:00:57 +0200 |
| commit | ff94b4ce388a577a930ee98c4f82d961585ac6c3 (patch) | |
| tree | 5ce6b02ca6cacd613baab70c5a755aa6feff15d1 /.gitignore | |
| parent | eea315623fdff018f389dad2ab037a2b2aaf982b (diff) | |
| parent | 4100798b86106832373b5afca77960edec5cdcc8 (diff) | |
| download | mediagoblin-ff94b4ce388a577a930ee98c4f82d961585ac6c3.tar.lz mediagoblin-ff94b4ce388a577a930ee98c4f82d961585ac6c3.tar.xz mediagoblin-ff94b4ce388a577a930ee98c4f82d961585ac6c3.zip | |
Merge remote branch 'upstream/master' into dev/mount_storage
Conflicts:
mediagoblin/storage.py
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 |