https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6855474
bd2c8c9
)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
author
Simon L'nu
<simon.lnu@gmail.com>
Thu, 1 Mar 2012 04:26:49 +0000
(23:26 -0500)
committer
Simon L'nu
<simon.lnu@gmail.com>
Thu, 1 Mar 2012 04:26:49 +0000
(23:26 -0500)
* remotes/upstream/master:
yet more work on notifications
notification enhancements
better handling of multiple notifications for same item, and old notifications
* master:
Trivial merge