Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop from master 20200309 #3871

Merged
merged 21 commits into from
Mar 9, 2020
Merged

Develop from master 20200309 #3871

merged 21 commits into from
Mar 9, 2020

Conversation

tuxpiper
Copy link
Member

@tuxpiper tuxpiper commented Mar 9, 2020

This pull request makes the following changes:

  • Merge docs from master (gitbook) into develop , before setting up gitbook to integrate with develop instead
  • Conflict solved between all-contributors bot and gitbook format , but need to keep an eye on this

Fixes ushahidi/platform# .

Ping @ushahidi/platform

rowasc and others added 21 commits October 30, 2019 14:19
It was not easy to understand the goal of the installation helper so Cecilia provided some useful feedback I'm applying here.
Updating the installation helper intro with feedback from Cecilia
-I couldn't find a working link to the "simplified install of the bundle" (line 56) -- the directions should link out to the relevant page.
Update frequently-asked-questions.md
@tuxpiper tuxpiper merged commit 88da578 into develop Mar 9, 2020
@tuxpiper tuxpiper deleted the develop-from-master-20200309 branch March 9, 2020 17:01
@coveralls
Copy link

Coverage Status

Coverage remained the same at 20.526% when pulling 4714fb2 on develop-from-master-20200309 into d0d3325 on develop.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants