diff options
| author | Frederic Guillot <fred@kanboard.net> | 2017-11-15 15:04:12 -0800 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2017-11-15 15:05:06 -0800 |
| commit | 765cb42725f6035ea33dbcdee103ebefef562ed9 (patch) | |
| tree | ea3c921813e6c0ca4962a9792b5a246a7adee591 /assets | |
| parent | e03f5d17f0a80d6140030275d37ac48ea3230c66 (diff) | |
| parent | 0c378e2b5186175dd664145dcb9f83498c78b929 (diff) | |
Solve conflict in PR #3113
Diffstat (limited to 'assets')
0 files changed, 0 insertions, 0 deletions