diff options
author | Joshua Hesketh <josh@nitrotech.org> | 2017-03-06 12:50:04 +1100 |
---|---|---|
committer | James E. Blair <jeblair@redhat.com> | 2017-03-06 09:40:04 -0800 |
commit | 25695cbb51e84d7fe5f19f60ce521f72b74ac3eb (patch) | |
tree | 34c44581558120ecb6f5ac2d5c43d20c2fa10e75 /.gitignore | |
parent | e53250c80d8959dcbe63780f05558b451fa88ca1 (diff) | |
parent | 4da3416c3ea9d8281f3340213cb9bb4a76329ac9 (diff) | |
download | zuul-25695cbb51e84d7fe5f19f60ce521f72b74ac3eb.tar.gz |
Merge branch 'master' into feature/zuulv3
Change-Id: I37a3c5d4f12917b111b7eb624f8b68689687ebc4
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f51678564..d6a7477e4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.egg *.egg-info *.pyc +.idea .test .testrepository .tox |