diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 |
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /views/json/object | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
engine/lib/input.php
Diffstat (limited to 'views/json/object')
| -rw-r--r-- | views/json/object/default.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/json/object/default.php b/views/json/object/default.php index a01b215cc..d2e807621 100644 --- a/views/json/object/default.php +++ b/views/json/object/default.php @@ -1,6 +1,6 @@ <?php /** - * Elgg default layout + * JSON object view * * @package Elgg * @subpackage Core |