diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-03-06 14:13:36 +0000 |
commit | 3ee286527f1ec23ead2c11201b9fa504a5bf6208 (patch) | |
tree | 8a9f605f751126c884139a6b3baa2835684ed22b /.gitignore | |
parent | 2c2614c48957c32334aa9ba317db935a979cd67f (diff) | |
parent | fee4c20e9607ccc479c33b2476fa1ba709efe607 (diff) |
Merge branch 'master' of /srv/git/projects/parabolaweb
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a5862628 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +*.pyc +*.swp +*.swo +*~ +#*# +local_settings.py +archweb.db +archweb.db-* +testing/ +repos/ +lib/ |