projects
/
mediagoblin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into change_email
[mediagoblin.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index a15a56975925e67de05336d3571933d235f4d22f..85de0102b3f4d908190668e10a75979a699120a0 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-7,12
+7,15
@@
/build/
/eggs/
/lib/
/build/
/eggs/
/lib/
+/local/
/include/
/parts/
/share/
/mediagoblin.egg-info
/docs/_build/
/docs/build
/include/
/parts/
/share/
/mediagoblin.egg-info
/docs/_build/
/docs/build
+/api-docs/build
+/api-docs/source/mediagoblin*
/user_dev/
/paste_local.ini
/mediagoblin_local.ini
/user_dev/
/paste_local.ini
/mediagoblin_local.ini
@@
-20,7
+23,6
@@
/celery.db
/kombu.db
/server-log.txt
/celery.db
/kombu.db
/server-log.txt
-/mediagoblin/db/sql_switch.py
# Tests
/mediagoblin/tests/user_dev/
# Tests
/mediagoblin/tests/user_dev/
@@
-32,4
+34,4
@@
*.swp
# The legacy of buildout
*.swp
# The legacy of buildout
-.installed.cfg
\ No newline at end of file
+.installed.cfg