diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-15 13:22:48 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-15 13:22:48 -0700 |
| commit | 90353d90dcba24fd6cc137373616a9446076dd23 (patch) | |
| tree | cc1384e4b8c73f0bf66057aad78861b6dab96d9e | |
| parent | c9ce5664d4b9a9fe7bcde9ef5f123e58a8955e86 (diff) | |
| parent | f48aee59754e8d0a98b2ea88f74493737f9a1613 (diff) | |
| download | volse-hubzilla-90353d90dcba24fd6cc137373616a9446076dd23.tar.gz volse-hubzilla-90353d90dcba24fd6cc137373616a9446076dd23.tar.bz2 volse-hubzilla-90353d90dcba24fd6cc137373616a9446076dd23.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
| l--------- | doc/context/es | 1 | ||||
| l--------- | doc/context/es-es | 1 | ||||
| -rw-r--r-- | doc/context/es-es/admin/logs/help.html (renamed from doc/context/es/admin/logs/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/admin/queue/help.html (renamed from doc/context/es/admin/queue/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/admin/security/help.html (renamed from doc/context/es/admin/security/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/channel/help.html (renamed from doc/context/es/channel/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/chat/help.html (renamed from doc/context/es/chat/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/cloud/help.html (renamed from doc/context/es/cloud/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/connections/help.html (renamed from doc/context/es/connections/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/connections/ifpending/help.html (renamed from doc/context/es/connections/ifpending/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/events/help.html (renamed from doc/context/es/events/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/mail/help.html (renamed from doc/context/es/mail/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/network/help.html (renamed from doc/context/es/network/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/photos/help.html (renamed from doc/context/es/photos/help.html) | 0 | ||||
| -rw-r--r-- | doc/context/es-es/profile/help.html (renamed from doc/context/es/profile/help.html) | 0 |
15 files changed, 1 insertions, 1 deletions
diff --git a/doc/context/es b/doc/context/es new file mode 120000 index 000000000..55914a5c4 --- /dev/null +++ b/doc/context/es @@ -0,0 +1 @@ +es-es/
\ No newline at end of file diff --git a/doc/context/es-es b/doc/context/es-es deleted file mode 120000 index 6c4381495..000000000 --- a/doc/context/es-es +++ /dev/null @@ -1 +0,0 @@ -es
\ No newline at end of file diff --git a/doc/context/es/admin/logs/help.html b/doc/context/es-es/admin/logs/help.html index 3a2ec413d..3a2ec413d 100644 --- a/doc/context/es/admin/logs/help.html +++ b/doc/context/es-es/admin/logs/help.html diff --git a/doc/context/es/admin/queue/help.html b/doc/context/es-es/admin/queue/help.html index de9e6cdbb..de9e6cdbb 100644 --- a/doc/context/es/admin/queue/help.html +++ b/doc/context/es-es/admin/queue/help.html diff --git a/doc/context/es/admin/security/help.html b/doc/context/es-es/admin/security/help.html index 229a91561..229a91561 100644 --- a/doc/context/es/admin/security/help.html +++ b/doc/context/es-es/admin/security/help.html diff --git a/doc/context/es/channel/help.html b/doc/context/es-es/channel/help.html index 682125e27..682125e27 100644 --- a/doc/context/es/channel/help.html +++ b/doc/context/es-es/channel/help.html diff --git a/doc/context/es/chat/help.html b/doc/context/es-es/chat/help.html index 94df6a1d2..94df6a1d2 100644 --- a/doc/context/es/chat/help.html +++ b/doc/context/es-es/chat/help.html diff --git a/doc/context/es/cloud/help.html b/doc/context/es-es/cloud/help.html index 824fa5a94..824fa5a94 100644 --- a/doc/context/es/cloud/help.html +++ b/doc/context/es-es/cloud/help.html diff --git a/doc/context/es/connections/help.html b/doc/context/es-es/connections/help.html index a0aa9cf32..a0aa9cf32 100644 --- a/doc/context/es/connections/help.html +++ b/doc/context/es-es/connections/help.html diff --git a/doc/context/es/connections/ifpending/help.html b/doc/context/es-es/connections/ifpending/help.html index 84e547851..84e547851 100644 --- a/doc/context/es/connections/ifpending/help.html +++ b/doc/context/es-es/connections/ifpending/help.html diff --git a/doc/context/es/events/help.html b/doc/context/es-es/events/help.html index b0ac1f9ea..b0ac1f9ea 100644 --- a/doc/context/es/events/help.html +++ b/doc/context/es-es/events/help.html diff --git a/doc/context/es/mail/help.html b/doc/context/es-es/mail/help.html index 794af38a9..794af38a9 100644 --- a/doc/context/es/mail/help.html +++ b/doc/context/es-es/mail/help.html diff --git a/doc/context/es/network/help.html b/doc/context/es-es/network/help.html index 082f52a49..082f52a49 100644 --- a/doc/context/es/network/help.html +++ b/doc/context/es-es/network/help.html diff --git a/doc/context/es/photos/help.html b/doc/context/es-es/photos/help.html index 6623456eb..6623456eb 100644 --- a/doc/context/es/photos/help.html +++ b/doc/context/es-es/photos/help.html diff --git a/doc/context/es/profile/help.html b/doc/context/es-es/profile/help.html index 28ff22499..28ff22499 100644 --- a/doc/context/es/profile/help.html +++ b/doc/context/es-es/profile/help.html |