aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2017-02-25 19:12:41 +0100
committerKlaus Weidenbach <Klaus.Weidenbach@gmx.net>2017-02-27 23:40:29 +0100
commit503c368f9ec08a70e4dbacd7b729568da6e4ea92 (patch)
tree94222fe6380f9d7311a41c398d7ffd28594b15d6 /.gitignore
parent2848d1caaf48a33ab1fb9a0c7de534287107e57e (diff)
downloadvolse-hubzilla-503c368f9ec08a70e4dbacd7b729568da6e4ea92.tar.gz
volse-hubzilla-503c368f9ec08a70e4dbacd7b729568da6e4ea92.tar.bz2
volse-hubzilla-503c368f9ec08a70e4dbacd7b729568da6e4ea92.zip
:arrow_up: :hammer: Upgrade PHP Markdown library.
The current version throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the Markdown library to the current PHP Markdown Lib 1.7.0. Used composer to manage this library.
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 75be5b0c2..039a8f530 100755
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,8 @@ nbproject/
## composer
# locally installed composer binary
composer.phar
+# allow composer.lock, as it is required to have a common state
+!composer.lock
# vendor/ is managed by composer, no need to include in our repository
# requires new deployment and needs discussion first
#vendor/