diff options
| author | Sophie Schiller | 2018-11-03 14:00:39 +0100 |
|---|---|---|
| committer | Sophie Schiller | 2018-11-03 14:00:39 +0100 |
| commit | 8902033279043e8c2a6e6e92e3630cfeaec89b5c (patch) | |
| tree | 1ab9826bf5af47e5c969471ca8b9c8f983f58423 /.gitignore | |
| parent | 740c954b211efd525c82b3475359960981720e1a (diff) | |
| parent | e43a34fae03af3c052d0876e5bf8b065aebefee0 (diff) | |
Merge branch 'master' of git.c3voc.de:streaming-website
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -10,3 +10,4 @@ /.idea /*.iml +.DS_Store |