]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12588b1 65bf58b)
Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:33:52 +0000 (15:33 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:33:52 +0000 (15:33 -0400)
commit7d64d8c78cfa102b91975598ef9e574d2ef14b8c
treea0626f8b0c13e2e88fad4c0f5f05da64dd5fb668tree | snapshot
parent12588b1cf73fad7d0a76a29a46ec355150eaa54ecommit | diff
parent65bf58be806d19bc7fe962c0824160deab07d5c3commit | diff
Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165

Conflicts:
lib/noticelist.php
lib/noticelistitem.php diff1 | | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)