Commit Graph

3 Commits

Author SHA1 Message Date
Brion Vibber 59119482ca Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
2010-10-04 12:54:36 -07:00
Siebrand Mazeland 500f8e5a87 * i18n/L10n updates.
* remove superfluous whitespace.
2010-09-20 20:54:30 +02:00
Brion Vibber 95b534c5ce Move standalone plugin files into subdirectories so they can have locale data, etc added to them at leisure. 2010-09-15 14:10:18 -07:00