Merge gh-pages to master #733
Merged
Conversation
This file contains 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
Signed-off-by: Christoph Weitkamp <[email protected]>
…te during manual upgrade (#725) Signed-off-by: Wouter Born <[email protected]>
Signed-off-by: Christoph Weitkamp <[email protected]>
* Clarify Contact I spent hours trying to find the problem, as I was trying to send a command to a contact. I think it should be mentioned a contact item only accepts status, and the 'CommandType' should be renamed OpenClosed with a D as the status is in fact CLOSED and not CLOSE. Less confusing this way. * Update items.md Sign off from PR comment: Signed-off-by: Bas Stronks [email protected] (github: DomQuixote) * Reverted concept changes to make pr ready for merge. Signed-off-by: Jerome Luckenbach <[email protected]> * Revert really everything Signed-off-by: Jerome Luckenbach <[email protected]>
|
I think a rebase & merge is the way to go for this. |
Confectrician
approved these changes
Jul 8, 2018
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.
Related to #700 (comment).
This will merge the changes made to the current gh-pages branch to the new master branch since it was created.
Signed-off-by: Yannick Schaus [email protected]