added chapter volumes #201
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
updated bookstack version in bash commands adjusted Docker < 1.9 bash commands white space adjustments
solidnerd
approved these changes
May 15, 2020
There was a problem hiding this comment.
Hey @JHenneberg,
can you rebase your branch against master ? Currently I'm not able to merge it in the master branch.
Otherwise LGTM !
|
I never used rebase. Isn't it enough that I merged your master into my fork to sync them? From what I understand it should be fine (https://git-scm.com/book/de/v2/Git-Branching-Rebasing). |
|
I squashed all commits so it's also fine ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updated bookstack version in bash commands
adjusted Docker < 1.9 bash commands
white space adjustments