diff options
| author | Hakim El Hattab | 2016-01-11 10:02:40 +0100 |
|---|---|---|
| committer | Hakim El Hattab | 2016-01-11 10:02:40 +0100 |
| commit | 3c46733a544e6fbd9754787bf2fd24ebf9fe5e8d (patch) | |
| tree | 20ff377ee5e92fb6f014f9558bebe57b0cae4004 /plugin | |
| parent | c3919756f1a50fe696d7b690c64f0c9e7f5f6c62 (diff) | |
| parent | 7eca84254ea5a38829a145a86807a93e50c45ce4 (diff) | |
Merge pull request #1476 from prtksxna/patch-1
Remove rebase conflict in README.md
Diffstat (limited to 'plugin')
0 files changed, 0 insertions, 0 deletions