Merge branch 'master' into jwandborg-f482_media_attachments
[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 user_dev/
13 paste_local.ini
14 mediagoblin_local.ini
15 server-log.txt
16 *~
17 *.swp