From cbd23b7d191327a7cfb6a98e657659045da71af3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 29 Apr 2016 20:55:59 +0200
Subject: Second half of merge....

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 24a104ef..5b6e242b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 nbproject/
 /config.php
 /client_config_additional.php
+apis/tmpUploads/*
-- 
cgit v1.2.3-55-g7522