]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54f7154 a7abb23)
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:50:06 +0000 (11:50 -0800)
Conflicts:
classes/Profile.php

1  2 
lib/default.php patch | diff1 | diff2 | blob | history

diff --cc lib/default.php
Simple merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)