summaryrefslogtreecommitdiff
path: root/theme/biz/css/display.css
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
committerZach Copley <zach@controlyourself.ca>2009-09-08 16:02:57 -0700
commit9d87313eaebe8240393ac300a435f3b1332c8849 (patch)
tree6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /theme/biz/css/display.css
parent5efe588174c71979fc1970353c9a556ea441f138 (diff)
parentbeae3db41375879e725af053edf8041bbd76ac8c (diff)
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts: plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'theme/biz/css/display.css')
-rw-r--r--theme/biz/css/display.css8
1 files changed, 4 insertions, 4 deletions
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 3af4c06b9..240060b10 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -1,10 +1,10 @@
/** theme: biz
*
- * @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/
*/
@import url(base.css);