| commit | 4bbd8c93cc02f54b1d40ba3e8e7cceb0317cff19 | [log] [tgz] |
|---|---|---|
| author | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:49:38 2017 -0700 |
| committer | filmaj <maj.fil@gmail.com> | Thu Apr 27 12:49:38 2017 -0700 |
| tree | 36ef723b38e0c17720a7622ec04ce6112343d732 | |
| parent | baab98a02c786531eef821c48a28cbd6e92e1be1 [diff] | |
| parent | 273e5a674ec25e3f01a8c3992fa25c16f0f66065 [diff] |
Merge branch 'master' into 1.0.x