Merge branch '0.9.x' into activityexport

[quix0rs-gnu-social.git] / lib / activity.php

diff --git a/lib/activity.php b/lib/activity.php
index d3c725e630bd9e7d0cd307b6f231211589f300b0..f19f10e34dabfd647478d198ea2077c1ba3aaefe 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -397,4 +397,3 @@ class Activity
         return $d->format('c');
     }
 }
-