From f8b1e849a6a3bd53f24a4aac70bc904cdb5ff711 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 21 May 2015 23:52:06 +0200
Subject: deploy: merge next

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index a37850ab7..bad1d00ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.graveyard
 /hosts
 /secrets
+/tmp
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/ee200000.lock: No such file or directory (2)