diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
| commit | cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch) | |
| tree | b88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /library/tinymce/examples/lists/media_list.js | |
| parent | 29900febb341cfbec6e4445d4ea1c2dc782a521a (diff) | |
| parent | 808180ce5f9471aa36faf8861fb84d04b412f412 (diff) | |
| download | volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.gz volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.bz2 volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
boot.php
database.sql
include/template_processor.php
update.php
Diffstat (limited to 'library/tinymce/examples/lists/media_list.js')
| -rw-r--r--[-rwxr-xr-x] | library/tinymce/examples/lists/media_list.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/library/tinymce/examples/lists/media_list.js b/library/tinymce/examples/lists/media_list.js index 3a3836cc5..2e049587c 100755..100644 --- a/library/tinymce/examples/lists/media_list.js +++ b/library/tinymce/examples/lists/media_list.js @@ -6,5 +6,9 @@ var tinyMCEMediaList = [ // Name, URL
["Some Flash", "media/sample.swf"],
["Some Quicktime", "media/sample.mov"],
- ["Some AVI", "media/sample.avi"]
+ ["Some AVI", "media/sample.avi"],
+ ["Some RealMedia", "media/sample.rm"],
+ ["Some Shockwave", "media/sample.dcr"],
+ ["Some Video", "media/sample.mp4"],
+ ["Some FLV", "media/sample.flv"]
];
\ No newline at end of file |