aboutsummaryrefslogtreecommitdiffstats
path: root/include/features.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-06 12:57:25 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-06 12:57:25 +0100
commit2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (patch)
tree6935173702da59826d6c7577a927d96a57bc4478 /include/features.php
parent2afdba48f06bb99922c19bf964d8f601c1545166 (diff)
parent021584d782c5bfafaa5ffe26d0c5850c8fffdd8f (diff)
downloadvolse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.gz
volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.bz2
volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/features.php')
-rw-r--r--include/features.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/features.php b/include/features.php
index 4d8d162fa..d6a223089 100644
--- a/include/features.php
+++ b/include/features.php
@@ -38,6 +38,9 @@ function get_feature_default($feature) {
function get_features($filtered = true) {
+ if(UNO)
+ return array();
+
$arr = array(
// General