diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-15 23:31:20 -0400 |
| commit | 670ad53215eaaa40a55a1977b373a62940c50a42 (patch) | |
| tree | 5030420047361499de6d434d5a9315de4662e212 /lib/activity.php | |
| parent | 1ceb93cce483794582f1a928de27592acb4f89cf (diff) | |
| parent | dffec9f223c1e45832d274c34f7bd6624cbf87ea (diff) | |
Merge branch '0.9.x' into activityexport
Diffstat (limited to 'lib/activity.php')
| -rw-r--r-- | lib/activity.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/activity.php b/lib/activity.php index d3c725e63..f19f10e34 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -397,4 +397,3 @@ class Activity return $d->format('c'); } } - |