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/goldenrod/theme.php | |
| 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/goldenrod/theme.php')
| -rwxr-xr-x | view/theme/goldenrod/theme.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/view/theme/goldenrod/theme.php b/view/theme/goldenrod/theme.php deleted file mode 100755 index 47b43cf13..000000000 --- a/view/theme/goldenrod/theme.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$a->theme_info = array( - 'extends' => 'loozah', -); |