diff options
| author | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-10-06 17:16:13 -0700 |
| commit | 99194e03fa50b61f99164674afc949b4bbefd44a (patch) | |
| tree | 2d38f6ec4b1e6f314d925233c781315541772a0f /theme/pigeonthoughts/css/base.css | |
| parent | 033a7570133d4183c2e162859e9b85fe7df3e40b (diff) | |
| parent | 71176b9a98ef5298162f821c621a0e467dd9570b (diff) | |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'theme/pigeonthoughts/css/base.css')
| -rw-r--r-- | theme/pigeonthoughts/css/base.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css index bc2e24dc5..c31ea6b67 100644 --- a/theme/pigeonthoughts/css/base.css +++ b/theme/pigeonthoughts/css/base.css @@ -3,7 +3,7 @@ * @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 + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported * @link http://status.net/ */ |