Merge branch 'feature/strong-model-types' into develop
authorChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 08:43:11 +0000 (10:43 +0200)
committerChocobozzz <me@florianbigard.com>
Thu, 22 Aug 2019 08:43:11 +0000 (10:43 +0200)
commit5c5e587307a27e173333789b5b5167d35f468b01
tree94e3721caf2e11d38fd5f4112c0fc98da89ac535
parent1b42d73f44811eec1b7ddd72dd0d640a57c3376c
parentb5fecbf44192144d1ca27c23a0b53922de288c10
Merge branch 'feature/strong-model-types' into develop
server/lib/emailer.ts
server/lib/peertube-socket.ts