diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-30 17:11:16 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-30 17:11:16 -0700 |
| commit | d5a40cac25e1bcc936a4010ec0038f8e5143c0a0 (patch) | |
| tree | b071675ce7137dd5fc74b4ee47776dad68424796 /library/phpqrcode/tools/merge.bat | |
| parent | df41ce9536ad72cdc2d1edb1983a48519223da77 (diff) | |
| parent | 1097cd25830bc11d9aacf24f0e43322d6f397ca3 (diff) | |
| download | volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.tar.gz volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.tar.bz2 volse-hubzilla-d5a40cac25e1bcc936a4010ec0038f8e5143c0a0.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
several dav fixes
Conflicts:
include/items.php
Diffstat (limited to 'library/phpqrcode/tools/merge.bat')
0 files changed, 0 insertions, 0 deletions