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