From 339ab5e380d833194466c2d756799cd1e5698e6f Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sun, 29 Jan 2017 15:11:04 +0100
Subject: [PATCH] ignoring composer.lock, so it isn't accidentally checked in
 (again)

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 155fff7..e476e38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,10 @@ data/
 doc/*
 !doc/*.md
 
+# Ignore developers composer status so it isn't accidentally checked in,
+# see https://github.com/PrivateBin/PrivateBin/issues/84
+composer.lock
+
 # Ignore vendor dir of Composer except PHP files
 vendor/*.*
 vendor/*/*.*
@@ -23,7 +27,7 @@ vendor/**/tests
 vendor/**/build_phar.php
 !vendor/**/*.php
 
-# Ignore unit testing logs, api docs and eclipse project files
+# Ignore local node modules, unit testing logs, api docs and eclipse project files
 js/node_modules/
 tst/log/
 .settings