| commit | e8d6444a43015e39049f88758088ea70c3b18a76 | [log] [tgz] |
|---|---|---|
| author | Henri Koivuneva <henri.koivuneva@gmail.com> | Thu Nov 23 05:04:25 2017 +0200 |
| committer | Henri Koivuneva <henri.koivuneva@gmail.com> | Thu Nov 23 05:04:30 2017 +0200 |
| tree | 251dc51fa1d278ebda7a9147cf62147c785e9550 | |
| parent | 6a756ca799ac71f8eca7596b5a4cfe77b71ffc51 [diff] |
CSS: Try fixing conflict