diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-22 10:50:26 -0500 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-22 10:50:26 -0500 |
| commit | a8990fa2ec98ea14493515a92d6228729024409b (patch) | |
| tree | a0ce94c793d02e80ac95ec43a16c3b11a1884efa /.gitignore | |
| parent | rest of the changes (diff) | |
| parent | Merge pull request #3262 from matrix-org/rav/has_already_consented (diff) | |
| download | synapse-a8990fa2ec98ea14493515a92d6228729024409b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into 3218-official-prom
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6b45e62157..7acfe56d26 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ env/ *.config .vscode/ +.ropeproject/ |