diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
| commit | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch) | |
| tree | 2f9d83d87682b16ac6ac949382ab566fdca48076 /doc | |
| parent | b361bcea83140c28b5a5677905405de0ac102791 (diff) | |
| parent | afd2bf031eff688ae53e51f9199d025ca1935abe (diff) | |
| download | volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2 volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* master:
Diffstat (limited to 'doc')
| -rw-r--r--[-rwxr-xr-x] | doc/Account-Basics.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Bugs-and-Issues.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Connectors.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Developers.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Home.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Install.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Installing-Connectors.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Making-Friends.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Message-Flow.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Pages.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Plugins.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Profiles.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Remove-Account.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Settings.md | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | doc/Tags-and-Mentions.md | 0 |
15 files changed, 0 insertions, 0 deletions
diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 164a6be46..164a6be46 100755..100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md index 46abea9a3..46abea9a3 100755..100644 --- a/doc/Bugs-and-Issues.md +++ b/doc/Bugs-and-Issues.md diff --git a/doc/Connectors.md b/doc/Connectors.md index 08b4c135e..08b4c135e 100755..100644 --- a/doc/Connectors.md +++ b/doc/Connectors.md diff --git a/doc/Developers.md b/doc/Developers.md index 17aff3869..17aff3869 100755..100644 --- a/doc/Developers.md +++ b/doc/Developers.md diff --git a/doc/Home.md b/doc/Home.md index 30efc93f7..30efc93f7 100755..100644 --- a/doc/Home.md +++ b/doc/Home.md diff --git a/doc/Install.md b/doc/Install.md index 9455c62ba..9455c62ba 100755..100644 --- a/doc/Install.md +++ b/doc/Install.md diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md index 328e3b6c4..328e3b6c4 100755..100644 --- a/doc/Installing-Connectors.md +++ b/doc/Installing-Connectors.md diff --git a/doc/Making-Friends.md b/doc/Making-Friends.md index 3f1a24c8d..3f1a24c8d 100755..100644 --- a/doc/Making-Friends.md +++ b/doc/Making-Friends.md diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md index bb1c063d3..bb1c063d3 100755..100644 --- a/doc/Message-Flow.md +++ b/doc/Message-Flow.md diff --git a/doc/Pages.md b/doc/Pages.md index d0e6776a4..d0e6776a4 100755..100644 --- a/doc/Pages.md +++ b/doc/Pages.md diff --git a/doc/Plugins.md b/doc/Plugins.md index 29dff3187..29dff3187 100755..100644 --- a/doc/Plugins.md +++ b/doc/Plugins.md diff --git a/doc/Profiles.md b/doc/Profiles.md index 716db908e..716db908e 100755..100644 --- a/doc/Profiles.md +++ b/doc/Profiles.md diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index ae5de2cb6..ae5de2cb6 100755..100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md diff --git a/doc/Settings.md b/doc/Settings.md index 9808ecc5d..9808ecc5d 100755..100644 --- a/doc/Settings.md +++ b/doc/Settings.md diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md index ce4e45f42..ce4e45f42 100755..100644 --- a/doc/Tags-and-Mentions.md +++ b/doc/Tags-and-Mentions.md |