diff options
| author | Arno Richter <oelna@oelna.de> | 2017-12-20 00:51:55 +0100 |
|---|---|---|
| committer | Arno Richter <oelna@oelna.de> | 2017-12-20 00:51:55 +0100 |
| commit | 5b66fb60158b9399ab9611436e616e33beacfe1f (patch) | |
| tree | d4a69c9c7d0917d9c24319d8ee60d4122fc9bf65 /.gitignore | |
| parent | be1caa07cd615450599ba8c3c8cd5f0647d1f7a8 (diff) | |
| parent | 16a92171023782153acc23cd7335913ddfbbb362 (diff) | |
| download | microblog-5b66fb60158b9399ab9611436e616e33beacfe1f.tar.gz microblog-5b66fb60158b9399ab9611436e616e33beacfe1f.tar.bz2 microblog-5b66fb60158b9399ab9611436e616e33beacfe1f.zip | |
fix conflict in README.md, sigh
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions