]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.7.x' into 0.8.x
authorSarven Capadisli <csarven@controlyourself.ca>
Fri, 1 May 2009 00:16:25 +0000 (00:16 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Fri, 1 May 2009 00:16:25 +0000 (00:16 +0000)
commitd30df0790818d77b81ee8b271b9bd8ebe3063ee7
treed3a9b32815252caabcf16f593fbf4e2080cff93f
parentf798d1ea430d25c2f4a60179c65b39b1257a5340
parentb79fef307481b36b4d04dbabb54e3f6d9edf6896
Merge branch '0.7.x' into 0.8.x

Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
classes/Notice.php
lib/common.php
lib/router.php
lib/util.php
theme/base/css/display.css