Shashi Gowda 31c1177970 Merge branch '1.0.x' into people_tags_rebase ...

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

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

..

css

Merge branch '1.0.x' into people_tags_rebase

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

default-avatar-mini.png

Used Yahoo! Smush.it to save a few bytes on the images

2009-08-06 22:30:02 -04:00

default-avatar-profile.png

Used Yahoo! Smush.it to save a few bytes on the images

2009-08-06 22:30:02 -04:00

default-avatar-stream.png

Used Yahoo! Smush.it to save a few bytes on the images

2009-08-06 22:30:02 -04:00

logo.png

Updated StatusNet logos

2010-02-02 13:12:03 +01:00

mobilelogo.png

Updated StatusNet logos

2010-02-02 13:12:03 +01:00

theme.ini

Switch default, identica themes from @import to theme.ini include key; doesn't make much difference for internal core themes but it'll provide cut-n-pasters with a better example. :)

2010-09-02 15:06:47 -07:00