mirror of
https://github.com/hoernschen/dendrite.git
synced 2025-08-05 07:32:46 +00:00
Merge branch 'master' of github.com:matrix-org/dendrite into erikj/pagination
This commit is contained in:
commit
718a765ba8
89 changed files with 3161 additions and 963 deletions
4
vendor/manifest
vendored
4
vendor/manifest
vendored
|
@ -10,7 +10,7 @@
|
|||
{
|
||||
"importpath": "github.com/alecthomas/gometalinter",
|
||||
"repository": "https://github.com/alecthomas/gometalinter",
|
||||
"revision": "0262fb20957a4c2d3bb7c834a6a125ae3884a2c6",
|
||||
"revision": "b8b1f84ae8cb72e7870785840eab2d6c6355aa9f",
|
||||
"branch": "master"
|
||||
},
|
||||
{
|
||||
|
@ -135,7 +135,7 @@
|
|||
{
|
||||
"importpath": "github.com/matrix-org/gomatrixserverlib",
|
||||
"repository": "https://github.com/matrix-org/gomatrixserverlib",
|
||||
"revision": "8540d3dfc13c797cd3200640bc06e0286ab355aa",
|
||||
"revision": "afa71391f946312c40639a419045e06b8ff2309a",
|
||||
"branch": "master"
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue