diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-24 01:25:55 +0800 |
| commit | 280f8faab4f692ff7f4389f82397adfa6db56325 (patch) | |
| tree | 94a076bfb3d13c7e6699e0149ee75fff6801880c /lib/subs.php | |
| parent | bb3361467c002e38aa3a424672f332b32a647e17 (diff) | |
| parent | eb40fbc17ad1efb0a4c51ee00b1e9408d2af382f (diff) | |
Merge branch '0.8.x' into small-fixes
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
Diffstat (limited to 'lib/subs.php')
| -rw-r--r-- | lib/subs.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/subs.php b/lib/subs.php index 0e7b9ded5..3bd67b39c 100644 --- a/lib/subs.php +++ b/lib/subs.php @@ -1,7 +1,7 @@ <?php /* * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. + * Copyright (C) 2008, 2009, Control Yourself, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by |