summaryrefslogtreecommitdiff
path: root/public/img
diff options
context:
space:
mode:
authorFlorian <florianraemisch@web.de>2011-03-31 15:44:33 +0200
committerFlorian <florianraemisch@web.de>2011-03-31 15:44:33 +0200
commit9cb35eb1e07e4b06aeee6dd98ff00684fa00f6f1 (patch)
treee77d7ecdd62421bc2952ff4c38347f476b358137 /public/img
parent2da08031a1f4e62aef7e17f6947908d9ceaa20c0 (diff)
parent41dd0c1f23eba3e8bb272f2a0df51f937e4d95d0 (diff)
Merge branch 'master' of oberon.sublab.org:website
Diffstat (limited to 'public/img')
-rw-r--r--public/img/favicon.pngbin0 -> 316 bytes
-rw-r--r--public/img/trieste.jpgbin0 -> 51089 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/public/img/favicon.png b/public/img/favicon.png
new file mode 100644
index 0000000..ae20cc3
--- /dev/null
+++ b/public/img/favicon.png
Binary files differ
diff --git a/public/img/trieste.jpg b/public/img/trieste.jpg
new file mode 100644
index 0000000..6814395
--- /dev/null
+++ b/public/img/trieste.jpg
Binary files differ