diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /doc/dev-function-overview.md | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'doc/dev-function-overview.md')
-rw-r--r-- | doc/dev-function-overview.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md index e228268dd..1ef80d343 100644 --- a/doc/dev-function-overview.md +++ b/doc/dev-function-overview.md @@ -21,7 +21,7 @@ Returns the global app structure ($a). * App::get_observer() -(App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely). +(App:: is usually assigned to the global $a), so App::get_observer() or App::get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely). * get_config($family,$key), get_pconfig($uid,$family,$key) |