summary refs log tree commit diff
path: root/webclient/app-controller.js
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 15:06:24 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 15:06:24 +0100
commitb07bc9bdbdcf70755c1075e204e36e8ebd44e57d (patch)
treed7943508bd16f2c4e2d81590ad1edcc1ff1d4d5c /webclient/app-controller.js
parentMerge branch 'client_server_url_rename' into develop (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff)
downloadsynapse-b07bc9bdbdcf70755c1075e204e36e8ebd44e57d.tar.xz
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'webclient/app-controller.js')
0 files changed, 0 insertions, 0 deletions