diff options
author | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 11:58:54 +0200 |
---|---|---|
committer | Matthew Hodgson <matthew@matrix.org> | 2014-11-13 11:58:54 +0200 |
commit | 28408a9f64dc889078711b0e2bae5cff4c90c91e (patch) | |
tree | 35ea17e51de82925f171bb15d4b9876d67b3bf9c /.gitignore | |
parent | various fixes based on truphone feedback (diff) | |
parent | Detect OpenWebRTC and add workarounds, but comment out the turn server remova... (diff) | |
download | synapse-28408a9f64dc889078711b0e2bae5cff4c90c91e.tar.xz |
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3d14ac8c03..339a99e0d6 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ graph/*.png graph/*.dot **/webclient/config.js -webclient/test/environment-protractor.js +**/webclient/test/coverage/ +**/webclient/test/environment-protractor.js uploads |