diff options
author | Florian <florianraemisch@web.de> | 2011-10-15 18:48:02 +0200 |
---|---|---|
committer | Florian <florianraemisch@web.de> | 2011-10-15 18:48:02 +0200 |
commit | 451889df8d9c423f2abe122f629d52e750f5cc14 (patch) | |
tree | 9ed88d513b44e0127b160c1bb766cd4b85e371c0 /public | |
parent | 24d87ac436b0124536671a301ff89fa44e7ada11 (diff) | |
parent | b1a2643d4d1f0cf8de204aa2c959245dace87cc4 (diff) |
Merge branch 'master' of oberon.sublab.org:website
Diffstat (limited to 'public')
-rw-r--r-- | public/css/sublab-new.css (renamed from public/css/sublab.css) | 0 | ||||
-rw-r--r-- | public/img/rackconsole.jpg | bin | 0 -> 229900 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/public/css/sublab.css b/public/css/sublab-new.css index e4aa7d8..e4aa7d8 100644 --- a/public/css/sublab.css +++ b/public/css/sublab-new.css diff --git a/public/img/rackconsole.jpg b/public/img/rackconsole.jpg Binary files differnew file mode 100644 index 0000000..d41bccc --- /dev/null +++ b/public/img/rackconsole.jpg |