]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 04:26:49 +0000 (23:26 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 1 Mar 2012 04:26:49 +0000 (23:26 -0500)
commitb7ab2a2fc92bbd7ec3a506e18f950579e10719eb
tree951a691592d7a52a85267da7aba9c2d8e15a53bd
parent68554741465e92fe2e462b8de4470ddd0eb91302
parentbd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61
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: