diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-01 09:54:01 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 09:54:01 +1100 |
| commit | fa02f3a1089975319df5a223c730f0f0249fd4bb (patch) | |
| tree | 881bb6a3ccba460503d83fb84ed26eb210070cf0 /.gitignore | |
| parent | 360397b2ed849521638428a51b1bb1d68389ad4a (diff) | |
| parent | 503c368f9ec08a70e4dbacd7b729568da6e4ea92 (diff) | |
| download | volse-hubzilla-fa02f3a1089975319df5a223c730f0f0249fd4bb.tar.gz volse-hubzilla-fa02f3a1089975319df5a223c730f0f0249fd4bb.tar.bz2 volse-hubzilla-fa02f3a1089975319df5a223c730f0f0249fd4bb.zip | |
Merge pull request #686 from dawnbreak/markdown
Upgrade PHP Markdown library.
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 2 |
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/ |