diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-25 16:19:10 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-25 16:19:10 +0200 |
| commit | a71e3134bf7250b60cafd1e51098eea70c3459de (patch) | |
| tree | 456f59d30e5f4b8d22f4bfdac0c55e7323cd0427 /include/conversation.php | |
| parent | 8c80fe0bf51fa472ddf9bf225490e47ea1bf4a7f (diff) | |
| parent | d1345e505406b1a1cdc3fc26a1734916c8abc89d (diff) | |
| download | volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.gz volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.tar.bz2 volse-hubzilla-a71e3134bf7250b60cafd1e51098eea70c3459de.zip | |
Merge remote branch 'upstream/master'
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 6bf673b97..dc574ddff 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -174,6 +174,7 @@ function localize_item(&$item){ } } + } /** |