diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /docs/contenthandler.txt | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'docs/contenthandler.txt')
| -rw-r--r-- | docs/contenthandler.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt index 3f0fca21..5f9a0b03 100644 --- a/docs/contenthandler.txt +++ b/docs/contenthandler.txt @@ -8,6 +8,7 @@ Built-in content types are: * wikitext - wikitext, as usual * javascript - user provided javascript code +* json - simple implementation for use by extensions, etc. * css - user provided css code * text - plain text |