Merge branch 'master' into kadm-2019-06

This commit is contained in:
Jerome Petazzoni
2019-06-09 18:17:18 -05:00
7 changed files with 37 additions and 37 deletions

View File

@@ -80,7 +80,7 @@ and displays aggregated logs.
- DockerCoins is *not* a cryptocurrency
(the only common points are "randomness", "hashing", and "coins" in the name)
(the only common points are "randomness," "hashing," and "coins" in the name)
---