]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Mon, 18 Oct 2010 19:17:11 +0000 (12:17 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 18 Oct 2010 19:17:11 +0000 (12:17 -0700)
commit7765ddae81e9b29af06009d961b3d56b293f527c
tree0878a6c3341683966343af3ceaba682b3526c2de
parente0cb6d6f7fdda97cb6ed262f79706392e315c055
parente04a6ef93ef7706671ba14f5108690bfe12c1592
Merge branch '0.9.x' into 1.0.x

Conflicts:
README
lib/default.php
README
actions/shownotice.php
actions/showstream.php
lib/default.php
lib/util.php