diff options
| author | Max Kostikov <max@kostikov.co> | 2019-03-25 12:24:36 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-03-25 12:24:36 +0100 |
| commit | c218970890c9d522db67dd7f10d700c04c35a61d (patch) | |
| tree | 45c0584daf64d8bd434f556f133fe36eb1ba33be /.travis.yml | |
| parent | bd27ce252067a8336b7b2e74b0972865867308de (diff) | |
| parent | 44795b65f946c07fc058bee6fbe1422e5adf7c88 (diff) | |
| download | volse-hubzilla-c218970890c9d522db67dd7f10d700c04c35a61d.tar.gz volse-hubzilla-c218970890c9d522db67dd7f10d700c04c35a61d.tar.bz2 volse-hubzilla-c218970890c9d522db67dd7f10d700c04c35a61d.zip | |
Merge branch 'duplicate_fixes_1' into 'dev'
if we have an uuid deduplicate by uuid otherwise by mid
See merge request hubzilla/core!1573
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions