tree 1b37108cfbdfe1bd9142beb0bf3a52189ba1e00e
parent f955eb421978f8e1cc05db9761fcf5ed05abf69c
parent 0ee470e197ea77c053b8286d10f66b324f980a9d
author Filip Pytloun <filip@pytloun.cz> 1484650402 +0100
committer GitHub <noreply@github.com> 1484650402 +0100

Merge pull request #25 from jakubjosef/master

Matrix security extended to use GlobalAuth or ProjectAuth