eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source 
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
This commit is contained in:
Brion Vibber
2010-10-04 12:54:36 -07:00
parent 2db8aa3ec3 1652ded48c
commit 59119482ca
1105 changed files with 122118 additions and 26486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Minify/MinifyPlugin.php
View File

@@ -51,7 +51,6 @@ class MinifyPlugin extends Plugin
*
* @return boolean hook return
*/
function onStartInitializeRouter($m)
{
$m->connect('main/min',
@@ -177,8 +176,7 @@ class MinifyPlugin extends Plugin
'author' => 'Craig Andrews',
'homepage' => 'http://status.net/wiki/Plugin:Minify',
'rawdescription' =>
_m('The Minify plugin minifies your CSS and Javascript, removing whitespace and comments.'));
_m('The Minify plugin minifies StatusNet\'s CSS and JavaScript, removing whitespace and comments.'));
return true;
}
}