aboutsummaryrefslogtreecommitdiffstats
path: root/doc/dav_windows.bb
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-20 16:55:24 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-20 16:55:24 -0700
commitb240c15014ec440c414407dd2b73567b39391e0e (patch)
tree935d34c65b90230269654e4e9e0ea30430ad4687 /doc/dav_windows.bb
parent996cd7e2aba37ce2c4613753a68552c92dcb9be9 (diff)
parent9de8df496a98019d4b4a3e7549e0d5047dd87024 (diff)
downloadvolse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.tar.gz
volse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.tar.bz2
volse-hubzilla-b240c15014ec440c414407dd2b73567b39391e0e.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
Diffstat (limited to 'doc/dav_windows.bb')
0 files changed, 0 insertions, 0 deletions