diff options
author | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-07 17:37:37 +0200 |
---|---|---|
committer | Sebastian Deiss <sdeiss@haw-landshut.de> | 2014-04-07 17:37:37 +0200 |
commit | 550f0b99eadf8a366253046acdd944709214123f (patch) | |
tree | 858e8a5a89a93b099f4282da4e67ae446325a3ac /sites/_shared_static/logo.png | |
parent | 8e3561b5b123a993b7f19d0b1ce5c5e67e370cbc (diff) | |
parent | 57e647341f416c879ae3841c9a7be50c52a21327 (diff) |
Merge branch 'paramiko:master' into gssapi-py3-support
Conflicts:
dev-requirements.txt
Diffstat (limited to 'sites/_shared_static/logo.png')
-rw-r--r-- | sites/_shared_static/logo.png | bin | 6401 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/sites/_shared_static/logo.png b/sites/_shared_static/logo.png Binary files differdeleted file mode 100644 index bc76697e..00000000 --- a/sites/_shared_static/logo.png +++ /dev/null |