diff options
author | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-08-27 11:16:45 -0700 |
commit | 5d09b6b3f0595540c66b703ae085f0af904fe30f (patch) | |
tree | 59269a4dacf90bbab9f0ff63afff4bf1781a1240 /theme/biz/css/base.css | |
parent | f1fda6c0503e32edfc99b297f4bf2cb07e629d9e (diff) | |
parent | 82b0927f5838f3c12816e03712df9460a9f77b72 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/finishremotesubscribe.php
actions/postnotice.php
actions/public.php
actions/remotesubscribe.php
actions/showstream.php
actions/updateprofile.php
actions/userauthorization.php
classes/laconica.ini
lib/common.php
lib/oauthstore.php
lib/omb.php
Diffstat (limited to 'theme/biz/css/base.css')
-rw-r--r-- | theme/biz/css/base.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 696fd0645..5245ea5d2 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -1,10 +1,10 @@ /** theme: biz base * - * @package Laconica - * @author Sarven Capadisli <csarven@controlyourself.ca> - * @copyright 2009 Control Yourself, Inc. + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ * { margin:0; padding:0; } |