| commit | 564033fcbe486049744fb6a0ffed78c6376abf2a | [log] [tgz] |
|---|---|---|
| author | filmaj <maj.fil@gmail.com> | Thu Apr 27 11:20:25 2017 -0700 |
| committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 11:20:25 2017 -0700 |
| tree | aaf84c167bd7f1cfe1c27393e56777003134cf6d | |
| parent | f23d41e7871edd995394b5a51ffa052961722def [diff] | |
| parent | fa26558d7f2d68bda738567ffd5af3d9f58c4d82 [diff] |
Merge master --> 1.0.x