diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-27 20:15:27 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-27 20:15:27 +0100 |
| commit | a1919db7cd20e0bd5102d9e806a70e49194c177a (patch) | |
| tree | 2580614733b3c910ee5adc0dbe9ec0f12f038554 | |
| parent | 18bd007714db261bedad8d3f175e0df5f3a60cdb (diff) | |
| parent | 8def08a56cf304fbc55090b280e35b798b72055a (diff) | |
Merge branch 'master' into staging