diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-03 09:46:39 +0100 |
commit | ddc16d8642b92972b9bfb7d47d2a0f415fd326bf (patch) | |
tree | 5a29e291a75dd1b33299b2269850dc9e16ac6fca /webclient/app-controller.js | |
parent | Add ban support: /rooms/$roomid/ban with { user_id : foo } (diff) | |
parent | Add database upgrade script (diff) | |
download | synapse-ddc16d8642b92972b9bfb7d47d2a0f415fd326bf.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'webclient/app-controller.js')
0 files changed, 0 insertions, 0 deletions