aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-17 23:11:20 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-17 23:11:20 +0200
commitd81b39da4c0f67b5f1c02da31f2c671aaca39624 (patch)
treed098dbcf24c41c69f0fafe0910c1b8779a185751 /.gitignore
parentbb770e295cd727429df524b0a5c3952ea449fdb2 (diff)
parentd4ff1606c36b2243996b60657f374520d69cd1a3 (diff)
downloadmediagoblin-d81b39da4c0f67b5f1c02da31f2c671aaca39624.tar.lz
mediagoblin-d81b39da4c0f67b5f1c02da31f2c671aaca39624.tar.xz
mediagoblin-d81b39da4c0f67b5f1c02da31f2c671aaca39624.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9e01560a..9187e738 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ mediagoblin.egg-info
docs/_build/
user_dev/
server-log.txt
-*~ \ No newline at end of file
+*~
+*.swp