diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /server/helpers/utils.js | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'server/helpers/utils.js')
| -rw-r--r-- | server/helpers/utils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/helpers/utils.js b/server/helpers/utils.js index a77116e08..9c2d402e3 100644 --- a/server/helpers/utils.js +++ b/server/helpers/utils.js | |||
| @@ -5,8 +5,8 @@ const crypto = require('crypto') | |||
| 5 | const logger = require('./logger') | 5 | const logger = require('./logger') |
| 6 | 6 | ||
| 7 | const utils = { | 7 | const utils = { |
| 8 | cleanForExit: cleanForExit, | 8 | cleanForExit, |
| 9 | generateRandomString: generateRandomString | 9 | generateRandomString |
| 10 | } | 10 | } |
| 11 | 11 | ||
| 12 | function generateRandomString (size, callback) { | 12 | function generateRandomString (size, callback) { |