diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-03 18:25:17 +0100 |
| commit | d72ce4da64416eb10224e6a6b55aecdd27967b6b (patch) | |
| tree | ec86c93b1ebaf0ebb11f9e9d2a5377f608ab98b2 /webclient/app-directive.js | |
| parent | Make registering and logging in with a threepid work in the webclient. (diff) | |
| parent | Fix ban path (diff) | |
| download | synapse-d72ce4da64416eb10224e6a6b55aecdd27967b6b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts: synapse/http/client.py
Diffstat (limited to 'webclient/app-directive.js')
| -rw-r--r-- | webclient/app-directive.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/app-directive.js b/webclient/app-directive.js index eee0d3842f..75283598ab 100644 --- a/webclient/app-directive.js +++ b/webclient/app-directive.js @@ -1,5 +1,5 @@ /* - Copyright 2014 matrix.org + Copyright 2014 OpenMarket Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |