| commit | 662cd4f1e32fcb41947e65299ab3908cb1bf2d0b | [log] [tgz] |
|---|---|---|
| author | Michael Kutý <6du1ro.n@gmail.com> | Mon Nov 30 15:04:57 2015 +0100 |
| committer | Michael Kutý <6du1ro.n@gmail.com> | Mon Nov 30 15:04:57 2015 +0100 |
| tree | e06648569e1a64009d1e937f9f014d110e3cadda | |
| parent | 0954ee64d8d53e715748155825435b42e3cabcdc [diff] | |
| parent | 8951b30824c0b1041d12b93b402cee3b8f533e0a [diff] |
Merge branch 'hotfix/helpdesk' into master-2