]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 033a757 71176b9)
Merge branch '1.0.x' into schema-x
authorBrion Vibber <brion@pobox.com>
Thu, 7 Oct 2010 00:16:13 +0000 (17:16 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 7 Oct 2010 00:16:13 +0000 (17:16 -0700)
commit99194e03fa50b61f99164674afc949b4bbefd44a
tree2d38f6ec4b1e6f314d925233c781315541772a0ftree | snapshot
parent033a7570133d4183c2e162859e9b85fe7df3e40bcommit | diff
parent71176b9a98ef5298162f821c621a0e467dd9570bcommit | diff
Merge branch '1.0.x' into schema-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. :-)