]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b032750 a1a3ab1)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Fri, 19 Feb 2010 21:55:24 +0000 (16:55 -0500)
committerEvan Prodromou <evan@status.net>
Fri, 19 Feb 2010 21:55:24 +0000 (16:55 -0500)
commitd69f6dff6a0b62ddab929f6ba0801533a9031162
tree2b49953ca2b5306a512f90e5d780cbe07d225b3ctree | snapshot
parentb0327506a491f029b239ae703e1acb1d42ae299ccommit | diff
parenta1a3ab1c58cf8636c4e9ac6b9d44bdc18946a547commit | diff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Conflicts:
plugins/OStatus/actions/salmon.php
plugins/OStatus/actions/salmon.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. :-)