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/main.bb | |
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/main.bb')
-rw-r--r-- | doc/main.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/main.bb b/doc/main.bb index 634bb524c..1d44188a8 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -42,6 +42,7 @@ [zrl=[baseurl]/help/plugins]Plugins[/zrl]
[zrl=[baseurl]/help/DerivedTheme1]Creating Derivative Themes[/zrl]
[zrl=[baseurl]/help/schema_development]Schemas[/zrl]
+[zrl=[baseurl]/help/Translations]Translations[/zrl]
[zrl=[baseurl]/help/developers]Developers[/zrl]
[zrl=[baseurl]/help/intro_for_developers]Intro for Developers[/zrl]
[zrl=[baseurl]/help/api_functions]API functions[/zrl]
|