]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 029aa0c 61ab21b)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Fri, 13 Aug 2010 21:35:49 +0000 (14:35 -0700)
committerEvan Prodromou <evan@status.net>
Fri, 13 Aug 2010 21:35:49 +0000 (14:35 -0700)
commit926c77246bb168097b3f937b5cc22ee9721b83c9
treedea05edb30a9e6a1e7971727ea42c7214c06c808tree | snapshot
parent029aa0c61c9942c0688fd3dc9aa2893311543db1commit | diff
parent61ab21b711c3248c72c8336f481e8aa3d432c997commit | diff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
plugins/OStatus/classes/Ostatus_profile.php diff1 | diff2 | 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. :-)