]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 965e657) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 15:17:34 +0000 (10:17 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 15:17:34 +0000 (10:17 -0500)
commit3ab7132b640933fa5247d7783c958e3a95e6410b
tree5a3978b04694e004b44417871c0bdc05fb16831dtree | snapshot
parent965e657c20c60cb51565dcedfe286eff0ffebfbecommit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  $name appearing on testbubble items
  testbubble notifications

* master:
Unnamed repository; edit this file 'description' to name the repository.