]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of /var/www/mublog
authorEvan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 07:58:31 +0000 (08:58 +0100)
committerEvan Prodromou <git@evanprodromou.name>
Fri, 23 Jan 2009 07:58:31 +0000 (08:58 +0100)
commita7c85bebd5be9ea019a8c80d74730d7eb28d4651
treec3fdf9575a342624bc71aad1d439ae73594f558c
parent4873277b58941ae6ec16543f437f4267ccab5ac0
parent7aa496cd8a939960eeaf79f3397f6fe94097e047
Merge branch 'master' of /var/www/mublog

Conflicts:

actions/api.php
actions/deletenotice.php
actions/recoverpassword.php
actions/remotesubscribe.php
actions/tag.php
actions/tagrss.php
actions/twitapiaccount.php
actions/twitapiusers.php
classes/Notice.php
classes/User.php
lib/common.php
lib/language.php
lib/subs.php
lib/twitterapi.php
lib/util.php
scripts/inbox_users.php
scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
actions/api.php
actions/twitapiaccount.php
actions/twitapiusers.php
classes/Notice.php
classes/User.php
lib/language.php
lib/subs.php
lib/twitterapi.php
scripts/sitemap.php