diff options
| author | Philipp Wollschlegel <folken@kabelsalat.ch> | 2013-12-16 21:38:50 +0100 |
|---|---|---|
| committer | Philipp Wollschlegel <folken@kabelsalat.ch> | 2013-12-16 21:38:50 +0100 |
| commit | 50f465d9ffa9afe4cb40615e0425980adc9a1b42 (patch) | |
| tree | 9b2f8bdcff9adbc7e4632ae4e08700950d033006 /sidebar | |
| parent | 1ad93d874fc3bd97abc077ade91ae9e2c0f40cb8 (diff) | |
| parent | e5b1dfe9420c5ec1d6a36261004ba669144b5195 (diff) | |
Merge branch 'master' of git+ssh://www-static.zrh.internetputzen.com/home/www/wiki.starship-factory.ch/wiki
Conflicts:
index.mdwn
Diffstat (limited to 'sidebar')
| -rw-r--r-- | sidebar/fbicon.png | bin | 0 -> 469 bytes |
| -rw-r--r-- | sidebar/gplus-32.png | bin | 0 -> 968 bytes |
| -rw-r--r-- | sidebar/twitter-bird-white-on-blue.png | bin | 0 -> 4414 bytes |
| -rw-r--r-- | sidebar/white-large-chiclet.png | bin | 0 -> 938 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/sidebar/fbicon.png b/sidebar/fbicon.png Binary files differnew file mode 100644 index 00000000..c831fbe5 --- /dev/null +++ b/sidebar/fbicon.png diff --git a/sidebar/gplus-32.png b/sidebar/gplus-32.png Binary files differnew file mode 100644 index 00000000..395b9e19 --- /dev/null +++ b/sidebar/gplus-32.png diff --git a/sidebar/twitter-bird-white-on-blue.png b/sidebar/twitter-bird-white-on-blue.png Binary files differnew file mode 100644 index 00000000..f7dcc351 --- /dev/null +++ b/sidebar/twitter-bird-white-on-blue.png diff --git a/sidebar/white-large-chiclet.png b/sidebar/white-large-chiclet.png Binary files differnew file mode 100644 index 00000000..3a76415b --- /dev/null +++ b/sidebar/white-large-chiclet.png |
