diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-09-22 21:09:29 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-09-22 21:09:29 +0200 |
commit | 8a61f669a9e8afcb7774face63d492d3833478a1 (patch) | |
tree | b3ff06839520fbbf6577da3cab9c9783e92e4b35 /LICENSE | |
parent | Merge pull request #4404 (diff) | |
parent | README: remove overlooked conflict (diff) | |
download | monero-8a61f669a9e8afcb7774face63d492d3833478a1.tar.xz |
Merge pull request #4416
c05f98d4 README: remove overlooked conflict (moneromooo-monero)
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions