summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSimon Rettberg2016-04-29 20:55:59 +0200
committerSimon Rettberg2016-04-29 20:55:59 +0200
commitcbd23b7d191327a7cfb6a98e657659045da71af3 (patch)
treef029ab85c3ac07d3f2a56b4359fd36c265898d6d /.gitignore
parentMore Progress; Merged changes from ufpr up to 775cdbd29f5d0f70946d1d5ff09c091... (diff)
downloadslx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.gz
slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.xz
slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.zip
Second half of merge....
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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/*