diff options
author | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
---|---|---|
committer | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
commit | 47fba5827bd106f53625b543f30643ca5ba1c16e (patch) | |
tree | bef05781eacc6dbc67d03899e0dde0257ce58096 /vendor/sabre/vobject/.gitignore | |
parent | 47f75ad8bfbe8325a76ae6fe466aa8080fc87045 (diff) | |
parent | 516167c0f8579c8a068b6e52557e7e1109f897ae (diff) | |
download | volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.gz volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.bz2 volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.zip |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
Diffstat (limited to 'vendor/sabre/vobject/.gitignore')
-rw-r--r-- | vendor/sabre/vobject/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vendor/sabre/vobject/.gitignore b/vendor/sabre/vobject/.gitignore index 95935f798..f08b31359 100644 --- a/vendor/sabre/vobject/.gitignore +++ b/vendor/sabre/vobject/.gitignore @@ -16,6 +16,7 @@ bin/hoa # Development stuff testdata/ +.php_cs.cache # OS X .DS_Store |