diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/text_8php.js | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'doc/html/text_8php.js')
| -rw-r--r-- | doc/html/text_8php.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index be6fbeab3..e742132d5 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -50,6 +50,7 @@ var text_8php = [ "micropro", "text_8php.html#a2a902f5fdba8646333e997898ac45ea3", null ], [ "mimetype_select", "text_8php.html#a1633412120f52bdce5f43e0a127d9293", null ], [ "normalise_link", "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f", null ], + [ "normalise_openid", "text_8php.html#adba17ec946f4285285dc100f7860bf51", null ], [ "notags", "text_8php.html#a1af49756c8c71902a66c7e329c462beb", null ], [ "paginate", "text_8php.html#afe9f178d264d44a94dc1292aaf0fd585", null ], [ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ], @@ -73,6 +74,7 @@ var text_8php = [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ], [ "sslify", "text_8php.html#a33bdb5d4bfff2ede7caf61a98ac0a2e9", null ], [ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ], + [ "strip_zids", "text_8php.html#a2f2585385530cb935a6325c809d84a4d", null ], [ "theme_attachments", "text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53", null ], [ "unamp", "text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7", null ], [ "undo_post_tagging", "text_8php.html#a740ad03e00459039a2c0992246c4e727", null ], |