aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-03-29 15:28:28 +0100
committerMax Kostikov <max@kostikov.co>2019-03-29 15:28:28 +0100
commit7d392e5adb495fc0cae927198a340fc9f6a4288a (patch)
tree8c2ab00e10b338beb87ec46f25fe0c3e9fa005ad /.gitattributes
parentb0c33308be48d9d90dddad470bd6434daad700a2 (diff)
parentf44cc2b60cd762eed759ce1a3e9bb47f06f80302 (diff)
downloadvolse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.tar.gz
volse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.tar.bz2
volse-hubzilla-7d392e5adb495fc0cae927198a340fc9f6a4288a.zip
Merge branch 'z6_discover_fixes' into 'dev'
fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions