aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-02-20 08:52:13 +0100
committerMario <mario@mariovavti.com>2019-02-20 08:52:13 +0100
commit65e8ed6871ba40b1582853cf3e20822232226b24 (patch)
treeeaf2eff7a7d5a9902f93554bfd29e2e1dbbfac37 /.gitattributes
parentcead10b9af6ff9d8b1bc702ca21d27af7c2112f0 (diff)
parenta77d7b844240030a764455b78b1b13fc886322f5 (diff)
downloadvolse-hubzilla-65e8ed6871ba40b1582853cf3e20822232226b24.tar.gz
volse-hubzilla-65e8ed6871ba40b1582853cf3e20822232226b24.tar.bz2
volse-hubzilla-65e8ed6871ba40b1582853cf3e20822232226b24.zip
Merge branch 'dev' into 'dev'
basic support for nomadic content, fix for permitted guests deleting their own files in cloud space of other channel,urlencode category widget links See merge request hubzilla/core!1523
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions