Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: boot.php include/items.php util/messages.po
2015-07-03 15:03:56 -07:00
parent aa58f68bfd cbfb94c55c
commit a74631b554
4 changed files with 618 additions and 100 deletions
--- 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'];
-
 	}