diff options
| author | Florian <florianraemisch@web.de> | 2011-04-13 18:37:16 +0200 |
|---|---|---|
| committer | Florian <florianraemisch@web.de> | 2011-04-13 18:37:16 +0200 |
| commit | 9f12b48d2ca69adb6b95e4f003520efea10d444a (patch) | |
| tree | d93e45537ee4151cdb3593a9bcb98eb605eb331d | |
| parent | 50241e37920d5640cd147b98932660ab138dbf2b (diff) | |
| parent | cf403925786976a937b5fd33b7eacf7598009c47 (diff) | |
Merge branch 'master' of oberon.sublab.org:website
Conflicts:
public/css/sublab.css
| -rw-r--r-- | public/css/sublab.css | 3 | ||||
| -rw-r--r-- | public/img/topimage.jpg | bin | 158049 -> 71066 bytes | |||
| -rw-r--r-- | template/chattopic | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/public/css/sublab.css b/public/css/sublab.css index 5983a46..05ed3e3 100644 --- a/public/css/sublab.css +++ b/public/css/sublab.css @@ -53,7 +53,10 @@ div.image { margin-left: 125px; border: 1px solid #444; height: 150px; +<<<<<<< HEAD background: #000 url(../img/topimage.png) no-repeat left center; +======= +>>>>>>> cf403925786976a937b5fd33b7eacf7598009c47 } div.menu { diff --git a/public/img/topimage.jpg b/public/img/topimage.jpg Binary files differindex 331f0ca..447b26d 100644 --- a/public/img/topimage.jpg +++ b/public/img/topimage.jpg diff --git a/template/chattopic b/template/chattopic index 58bbb5a..0e0e161 100644 --- a/template/chattopic +++ b/template/chattopic @@ -1,2 +1,2 @@ -<b>Jetzt im sublab:</b><br> -Der Frühling ist da!!! +<b>Donnerstag ab 21:00</b><br> +sub:lounge |
