| commit | 7ff74596747fad9b2d596c3f756875bb8c8e1f01 | [log] [tgz] |
|---|---|---|
| author | Aleš Komárek <mail@newt.cz> | Sun Aug 21 22:13:24 2016 +0200 |
| committer | Aleš Komárek <mail@newt.cz> | Sun Aug 21 22:13:24 2016 +0200 |
| tree | 3c50582fe02c8d9d25cc96c157269ea8e4582882 | |
| parent | 9faaed29fd300c684d73447f8ffba8f65560b5f1 [diff] | |
| parent | bbd978cad77b83b2085e155630ec3ea59fd7b0b6 [diff] |
Merge branch 'mine_publish' into 'master' Salt ACL and API updates See merge request !12