diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-03-05 19:58:22 +0200 |
| commit | 7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f (patch) | |
| tree | 5715424ab1454463a3f8ca458729347bbc014f5b /README.md | |
| parent | 7b68f1901e8bd81ec8fbebb60a3f4e057b57d06d (diff) | |
| parent | 39f2837838ba30ec02bfe9f33c9fa0dfca05d1a6 (diff) | |
| download | wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.gz wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.tar.bz2 wekan-7c9a30d8fe3ffdf4b56cdc816bfc51f60881d55f.zip | |
Fix merge conflict.
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions