diff options
author | kaniini <ariadne@dereferenced.org> | 2019-09-16 09:09:21 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-09-16 09:09:21 +0000 |
commit | c623b4324deaf236334a0f77a81435b5bffadf3c (patch) | |
tree | 3e4ed9af085e410ebab1adbb6ecc1d9cd84f3e42 /.gitignore | |
parent | 4fabf83ad01352442906d79187aeab4c777f4df8 (diff) | |
download | pleroma-c623b4324deaf236334a0f77a81435b5bffadf3c.tar.gz pleroma-c623b4324deaf236334a0f77a81435b5bffadf3c.zip |
Revert "Merge branch 'streamer-refactoring' into 'develop'"
This reverts merge request !1653
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 3b0c7d361..4e71a7df0 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,3 @@ docs/generated_config.md # Code test coverage /cover /Elixir.*.coverdata - -.idea -pleroma.iml - |