| commit | 2ef0aaf2a8779b844e1a58ae88dd4e14c4cbd947 | |
| author | Tomáš Brada <tomasbrod@azet.sk> | |
| Wed, 2 Dec 2015 16:56:23 +0000 (2 17:56 +0100) | ||
| committer | Tomáš Brada <tomasbrod@azet.sk> | |
| Wed, 2 Dec 2015 16:56:23 +0000 (2 17:56 +0100) | ||
| tree | af75917dbe04dd18de0247ec2c52000990d3c102 | treesnapshot (tar.gz zip) |
| parent | 132541b14d47f699b19b2de3bcdd7880c876a594 | commitdiff |
| parent | fddad0039582bf864fdc88206e3365d3fe35fc45 | commitdiff |
Merge branch 'files' into dev