swish/commit
Resolved merge conflict
| author | Jan Wielemaker |
|---|---|
| Thu Sep 7 13:52:33 2017 +0200 | |
| committer | Jan Wielemaker |
| Thu Sep 7 13:52:33 2017 +0200 | |
| commit | 11f236c0afe11b45684adec6f0dba3298eb0adcd |
| tree | 4206d62720fe197feabac9e5675e95eef538a53c |
| parent | c717af6876395449aba4366f4e994604d5c46818 037d4a071d4bceca676bbae772bd055f523455c1 |
Diff style: patch stat