aboutsummaryrefslogtreecommitdiffstats
path: root/include/activities.php
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
commit45a854762b451dafb882bc56efce054b64420627 (patch)
tree958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /include/activities.php
parent1806da0851dd5cf5978b19d12783ae3101a11257 (diff)
parenta29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff)
downloadvolse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'include/activities.php')
-rw-r--r--include/activities.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/activities.php b/include/activities.php
index df43f1f6f..9ba191391 100644
--- a/include/activities.php
+++ b/include/activities.php
@@ -11,7 +11,7 @@ function profile_activity($changed, $value) {
require_once('include/items.php');
- $self = $a->get_channel();
+ $self = App::get_channel();
if(! count($self))
return;