summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-11-10 17:34:54 -0500
committerMicah Anderson <micah@riseup.net>2015-11-10 17:34:54 -0500
commit93ac9288e301643a4b9c31e2750a231f4e7bc8d8 (patch)
tree92d7ea2d18f288cd7dfd852ee6af8787c722c87c /.gitignore
parent42814b5bf836a83724d2c74d6bb32bc168b7a81c (diff)
parente074eac10c6e08757857c770cb190cdb9d3a4583 (diff)
Merge branch 'debian/experimental' into debian/platform-0.8
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