diff options
| author | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-29 16:14:10 -0700 |
| commit | 9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch) | |
| tree | a73ed07970a517dbad90f14954fea790193813c3 /doc/html/language_8php.js | |
| parent | a00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff) | |
| parent | 1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff) | |
| download | volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2 volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip | |
Merge branch 'master' into newevent
Conflicts:
include/zot.php
Diffstat (limited to 'doc/html/language_8php.js')
| -rw-r--r-- | doc/html/language_8php.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/language_8php.js b/doc/html/language_8php.js index 260cbb417..23b8a292a 100644 --- a/doc/html/language_8php.js +++ b/doc/html/language_8php.js @@ -8,6 +8,6 @@ var language_8php = [ "pop_lang", "language_8php.html#a78bd204955ec4cc3a9ac651285a1689d", null ], [ "push_lang", "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a", null ], [ "string_plural_select_default", "language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0", null ], - [ "t", "language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04", null ], - [ "tt", "language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d", null ] + [ "t", "language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96", null ], + [ "tt", "language_8php.html#a686bcafa6b0d5c86d37b38a1db5b6997", null ] ];
\ No newline at end of file |