summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-28 10:59:30 -0400
committerKali Kaneko <kali@leap.se>2015-08-28 10:59:30 -0400
commit8fa97c02b5f07f896e52d9bb272128f267af04ea (patch)
treee0ce6bbaaa48441ebcfb807a45e8753fe8432423 /.gitignore
parentd272a953a01f5c601e4894a916f7b4d990a03327 (diff)
parentccecd1b3750bd10404511c33be1aaca82631a502 (diff)
Merge tag '0.4.2' into debian/experimental
Tag leap.common version 0.4.2 Conflicts: pkg/requirements-testing.pip setup.cfg src/leap/common/_version.py src/leap/common/events/events_pb2.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 25876cf..0e26c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
dist/
build/
MANIFEST
+_trial_temp