Commit graph

3 commits

Author SHA1 Message Date
Serra Allgood eaacecc36d Merge branch 'sca/631-alias-lookup' of github.com:serra-allgood/dendrite into sca/631-alias-lookup
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-02 12:14:17 -07:00
Serra Allgood dc935165cc roomserver/alias: Get tests passing
Signed-off-by: Serra Allgood <serra@allgood.dev>
2019-06-02 12:07:31 -07:00
Serra Allgood 77909e33c1 Merge remote-tracking branch 'origin/master' into sca/631-alias-lookup 2019-05-21 18:36:39 -07:00