diff options
| author | Zach Copley <zach@status.net> | 2010-07-29 20:44:11 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-07-29 20:44:11 +0000 |
| commit | fb2e00eacc7090df0d05311e39f08cb72164a78c (patch) | |
| tree | 7a3d33d537d9c2bcd5f2c8c58ed38790e1e7c248 /lib | |
| parent | fadeafbccc804063240c4f799a29e3ffa04b73e7 (diff) | |
| parent | 0faa988e91056564b2ae19f045a81b322cce4e0c (diff) | |
Merge branch 'master' into 0.9.x
Conflicts:
classes/Notice.php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/apiaction.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/apiaction.php b/lib/apiaction.php index 7868ecab1..479a86ad8 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -27,7 +27,7 @@ * @author Jeffery To <jeffery.to@gmail.com> * @author Toby Inkster <mail@tobyinkster.co.uk> * @author Zach Copley <zach@status.net> - * @copyright 2009 StatusNet, Inc. + * @copyright 2009-2010 StatusNet, Inc. * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ |