diff options
author | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-10 13:05:02 -0800 |
commit | 8c4eb839f9cf224c920e5a0c45c22961cac62ce1 (patch) | |
tree | d14015aff61323899803c2d5a4afb99d891a3770 /include/conversation.php | |
parent | c75cdbd304d493feef25ae73dbfd0b9ee39f9fd5 (diff) | |
parent | 50bc43733febf2aaea62d0d58c9537d2c63d74ce (diff) | |
download | volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.gz volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.tar.bz2 volse-hubzilla-8c4eb839f9cf224c920e5a0c45c22961cac62ce1.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/conversation.php')
-rw-r--r-- | include/conversation.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index a2fb3d162..986892fff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -264,6 +264,7 @@ function localize_item(&$item){ } + /* // FIXME store parent item as object or target // (and update to json storage) |