Merge remote branch 'refs/remotes/tychoish/master'
[mediagoblin.git] / .gitignore
1 dist/
2 bin/
3 develop-eggs/
4 build/
5 eggs/
6 parts/
7 .installed.cfg
8 mediagoblin.egg-info
9 *.pyc
10 *.pyo
11 docs/_build/
12 docs/build
13 user_dev/
14 paste_local.ini
15 mediagoblin_local.ini
16 server-log.txt
17 *~
18 *.swp