Merge branch 'master' into 'master'

Master

See merge request hubzilla/core!1211
This commit is contained in:
Mario 2018-06-08 08:26:15 +02:00
commit 5deecfea28
2 changed files with 72 additions and 72 deletions

View File

@ -13,7 +13,7 @@ You may fork/clone the $Projectname repository from [https://framagit.org/hubzil
Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/)
to create and use your own tracking fork on framagit to create and use your own tracking fork on framagit
Then go to your gramagit page and create a "Pull request" when you are ready Then go to your framagit page and create a "Pull request" when you are ready
to notify us to merge your work. to notify us to merge your work.
**Translations** **Translations**

View File

@ -9,7 +9,7 @@ doing development.
Create your own github account. Create your own github account.
You may fork/clone the project repository from [url=https://framagit.org/hubzilla.core.git]https://framgit.org/hubzilla/core.git[/url] You may fork/clone the project repository from [url=https://framagit.org/hubzilla.core.git]https://framagit.org/hubzilla/core.git[/url]
Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url] Follow the instructions provided here: [url=http://help.github.com/fork-a-repo/]http://help.github.com/fork-a-repo/[/url]
to create and use your own tracking fork on framagit to create and use your own tracking fork on framagit