diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /view/theme/slackr | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
Diffstat (limited to 'view/theme/slackr')
| -rw-r--r-- | view/theme/slackr/screenshot.jpg | bin | 0 -> 75494 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | view/theme/slackr/style.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/slackr/theme.php | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/screenshot.jpg Binary files differnew file mode 100644 index 000000000..eb1586d5d --- /dev/null +++ b/view/theme/slackr/screenshot.jpg diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index ed3b413fb..ed3b413fb 100755..100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index ceec4dd97..ceec4dd97 100755..100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php |
