]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commite7c7fd39fc948f1169512916077185dd29973b60
tree6fe8c025a308d423c87444a5daa5da1d02d62182
parentb483a0549f115b2d5f2cfb3d447e6cc5c4f469f3
parentb26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1
Merge branch '1.0.x' into schema-x

Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
lib/default.php