diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-29 23:26:49 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-29 23:26:49 -0500 |
| commit | b7ab2a2fc92bbd7ec3a506e18f950579e10719eb (patch) | |
| tree | 951a691592d7a52a85267da7aba9c2d8e15a53bd /include/conversation.php | |
| parent | 68554741465e92fe2e462b8de4470ddd0eb91302 (diff) | |
| parent | bd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff) | |
| download | volse-hubzilla-b7ab2a2fc92bbd7ec3a506e18f950579e10719eb.tar.gz volse-hubzilla-b7ab2a2fc92bbd7ec3a506e18f950579e10719eb.tar.bz2 volse-hubzilla-b7ab2a2fc92bbd7ec3a506e18f950579e10719eb.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
yet more work on notifications
notification enhancements
better handling of multiple notifications for same item, and old notifications
* master:
Diffstat (limited to 'include/conversation.php')
0 files changed, 0 insertions, 0 deletions