Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge · 90353d90dc - core - PCGF Git Server

harukin/core

Archived

Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

This commit is contained in:

redmatrix

2016-05-15 13:22:48 -07:00

parent c9ce5664d4 f48aee5975

commit 90353d90dc

15 changed files with 1 additions and 1 deletions

doc/context/es

Symlink

+1

View File

				`@@ -0,0 +1 @@`
				`es-es/`

doc/context/es-es

-1

View File

				`@@ -1 +0,0 @@`
				`es`

doc/context/es/admin/logs/help.html → doc/context/es-es/admin/logs/help.html

View File

doc/context/es/admin/queue/help.html → doc/context/es-es/admin/queue/help.html

View File

doc/context/es/admin/security/help.html → doc/context/es-es/admin/security/help.html

View File

doc/context/es/channel/help.html → doc/context/es-es/channel/help.html

View File

doc/context/es/chat/help.html → doc/context/es-es/chat/help.html

View File

doc/context/es/cloud/help.html → doc/context/es-es/cloud/help.html

View File

doc/context/es/connections/help.html → doc/context/es-es/connections/help.html

View File

doc/context/es/connections/ifpending/help.html → doc/context/es-es/connections/ifpending/help.html

View File

doc/context/es/events/help.html → doc/context/es-es/events/help.html

View File

doc/context/es/mail/help.html → doc/context/es-es/mail/help.html

View File

doc/context/es/network/help.html → doc/context/es-es/network/help.html

View File

doc/context/es/photos/help.html → doc/context/es-es/photos/help.html

View File

doc/context/es/profile/help.html → doc/context/es-es/profile/help.html

View File