]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 029aa0c 7f9ab68)
Merge branch 'testing'
authorBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)
commitb77c029aa811e08027d6dc8ed7d46be397eb6fb3
treefac7f311276c9b7a6695ed3fc4962d6ec715216dtree | snapshot
parent029aa0c61c9942c0688fd3dc9aa2893311543db1commit | diff
parent7f9ab683b259fc93d507eb705c84af0cfd2fae5bcommit | diff
Merge branch 'testing'

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. :-)