Merge branch 'master' of /var/www/mublog

Browse Source

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!

...

This commit is contained in:

Evan Prodromou

2009-01-23 08:58:31 +01:00

parent 4873277b58 7aa496cd8a

commit a7c85bebd5

432 changed files with 38858 additions and 19147 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1192

lib/twitterapi.php

File diff suppressed because it is too large Load Diff