diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
| commit | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (patch) | |
| tree | 6100f1aa00f9930433f178173099c0ce67fdc502 /actions/apiaccountupdatedeliverydevice.php | |
| parent | 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 (diff) | |
| parent | e121d472e7dbb914a85b10bde0a9e2add4d19d11 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
Diffstat (limited to 'actions/apiaccountupdatedeliverydevice.php')
| -rw-r--r-- | actions/apiaccountupdatedeliverydevice.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php index d42d25a61..e25b9a954 100644 --- a/actions/apiaccountupdatedeliverydevice.php +++ b/actions/apiaccountupdatedeliverydevice.php @@ -21,6 +21,7 @@ * * @category API * @package StatusNet + * @author Siebrand Mazeland <s.mazeland@xs4all.nl> * @author Zach Copley <zach@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 |