mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-22 14:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kegan/client-webserver

Browse source
This commit is contained in:
Kegan Dougal 2017-02-03 16:12:28 +00:00
parent aafaf6ede6 f87f7676bb
commit c3d549f618
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor/manifest vendored
View file

@ -74,7 +74,7 @@
{ {
"importpath": "github.com/matrix-org/util", "importpath": "github.com/matrix-org/util",
"repository": "https://github.com/matrix-org/util", "repository": "https://github.com/matrix-org/util",
"revision": "2aeb7e5d047ec74d65353f1579990a1e90af5bb0", "revision": "0f4d9cce82badc0741ff1141dcf079312cb4d2f0",
"branch": "master" "branch": "master"
}, },
{ {

5
vendor/src/github.com/matrix-org/util/json.go vendored
View file

@ -7,6 +7,7 @@ import (
"math/rand" "math/rand"
"net/http" "net/http"
"runtime/debug" "runtime/debug"
"time"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
) )
@ -152,3 +153,7 @@ func RandomString(n int) string {
} }
return string(b) return string(b)
} }
func init() {
rand.Seed(time.Now().UTC().UnixNano())
}