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/language_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/language_8php.js')
| -rw-r--r-- | doc/html/language_8php.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/language_8php.js b/doc/html/language_8php.js index ed2266957..260cbb417 100644 --- a/doc/html/language_8php.js +++ b/doc/html/language_8php.js @@ -3,6 +3,7 @@ var language_8php = [ "detect_language", "language_8php.html#a632da17c7ac0d2dc1a00a4706870194b", null ], [ "get_best_language", "language_8php.html#a980dee1d8715a98ab02e36b59facf8ed", null ], [ "get_browser_language", "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e", null ], + [ "get_language_name", "language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7", null ], [ "load_translation_table", "language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05", null ], [ "pop_lang", "language_8php.html#a78bd204955ec4cc3a9ac651285a1689d", null ], [ "push_lang", "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a", null ], |