diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-01 18:17:04 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-01 18:17:04 +0900 |
| commit | fea2e549ba42359a1e32618f489beda50e649504 (patch) | |
| tree | 3e7a23a086d51611e8f3211e407dd8bd83980fd4 /src/server/api | |
| parent | Merge pull request #1351 from akihikodaki/webfinger (diff) | |
| download | sharkey-fea2e549ba42359a1e32618f489beda50e649504.tar.gz sharkey-fea2e549ba42359a1e32618f489beda50e649504.tar.bz2 sharkey-fea2e549ba42359a1e32618f489beda50e649504.zip | |
Resolve conflict
Diffstat (limited to 'src/server/api')
0 files changed, 0 insertions, 0 deletions