]> 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: b483a05 b26eccf)
Merge branch '1.0.x' into schema-x
authorBrion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 23:27:53 +0000 (16:27 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 28 Oct 2010 23:27:53 +0000 (16:27 -0700)
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

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