aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-03 15:03:56 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-03 15:03:56 -0700
commita74631b55456bdbe24594bfc40c6e12bfa44c196 (patch)
tree525618649dcb5a201e8d0919f2a7fcfcc583df10 /include
parentaa58f68bfd2e2f0f1ebc58a9b399fda986356c99 (diff)
parentcbfb94c55cc422359f1cef3c6fe89d86f131a104 (diff)
downloadvolse-hubzilla-a74631b55456bdbe24594bfc40c6e12bfa44c196.tar.gz
volse-hubzilla-a74631b55456bdbe24594bfc40c6e12bfa44c196.tar.bz2
volse-hubzilla-a74631b55456bdbe24594bfc40c6e12bfa44c196.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: boot.php include/items.php util/messages.po
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 6484baeae..5e584b09c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1231,7 +1231,6 @@ function encode_item($item,$mirror = false) {
$x['item_delayed'] = $item['item_delayed'];
$x['item_pending_remove'] = $item['item_pending_remove'];
$x['item_blocked'] = $item['item_blocked'];
-
}