aboutsummaryrefslogtreecommitdiff
path: root/src/App.js
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2018-12-28 21:44:09 +0200
committershpuld <shp@cock.li>2018-12-28 21:44:09 +0200
commit650655709dd617a558709ffbf8911f05f7c17267 (patch)
tree5d87472d287b93bc845e442c91006070ef88f85d /src/App.js
parent85c058e95c04245dacf3ffb6b45a6eceb3253e7b (diff)
parenta86b80b0544ca93a1b59ff521fd9b1e8bbc3f8c9 (diff)
fix conflict in user card content
Diffstat (limited to 'src/App.js')
0 files changed, 0 insertions, 0 deletions