Merge branch '1.0.x' into people_tags_rebase

Browse Source

Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php

...

This commit is contained in:

Shashi Gowda

2011-03-22 07:56:25 +05:30

parent 894d4ba16f 0a71622aa7

commit 31c1177970

1625 changed files with 100423 additions and 112079 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

2

js/util.min.js vendored

File diff suppressed because one or more lines are too long