diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
| commit | 4f37c0ea9dd99b76258d07059e5f2dc6549f3f95 (patch) | |
| tree | 3130a9b275d0f77c04118d54334ca3d4a9b7d71d /.gitignore | |
| parent | update media repository implementation docs (diff) | |
| parent | oops (diff) | |
| download | synapse-4f37c0ea9dd99b76258d07059e5f2dc6549f3f95.tar.xz | |
Merge branch 'develop' into media_repository
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 339a99e0d6..af90668c89 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ graph/*.dot **/webclient/test/environment-protractor.js uploads + +.idea/ |