diff options
| author | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-03-05 10:09:53 -0600 |
| commit | 6279cc428b2464066f67e4795045680bb3d59973 (patch) | |
| tree | 5f8e22498468f316d88b326baa751abf0acb1d9d /.gitignore | |
| parent | 06bb4a4db67321e7629f4f2438516ba358f226e9 (diff) | |
| parent | af810c54fa9829096085f0ca601030c4fb74b5c7 (diff) | |
| download | pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.gz pyramid-6279cc428b2464066f67e4795045680bb3d59973.tar.bz2 pyramid-6279cc428b2464066f67e4795045680bb3d59973.zip | |
Merge branch 'master' into fix.shared-view-renderer
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8dca2069c..1e3f68f26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.egg *.egg-info +.eggs/ *.pyc *$py.class *.pt.py |