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 /mod/embed/languages | |
| 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 'mod/embed/languages')
| -rw-r--r-- | mod/embed/languages/en.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mod/embed/languages/en.php b/mod/embed/languages/en.php index 287d34ca1..6ae99a56f 100644 --- a/mod/embed/languages/en.php +++ b/mod/embed/languages/en.php @@ -5,7 +5,6 @@ */ $english = array( - 'media:insert' => 'Embed content', 'embed:embed' => 'Embed', 'embed:media' => 'Embed content', 'embed:instructions' => 'Click on any file to embed it into your content.', |