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

Fix http_server debug statement #682

Merged
merged 45 commits into from
Mar 21, 2017
Merged

Fix http_server debug statement #682

merged 45 commits into from
Mar 21, 2017

Conversation

hplato
Copy link
Collaborator

@hplato hplato commented Mar 21, 2017

No description provided.

hollie and others added 30 commits March 2, 2013 14:46
Ensure the naming is consistent with what we agreed upon on the mailing list.
…ing on this file to know what version it is running
Conflicts:
	README.md
	VERSION
	bin/mh
Cbus update to support current CGate
Conflicts:
	README.md
	docs/download.pod
Wikispace is no longer active.
Allows the control of WGL rain8Net serial sprinkler control modules.
Adds HTML message support and device parameters on API call for Pushover
Revert "Allows the control of WGL rain8Net serial sprinkler control modules" as it was created against stable...
@hplato
Copy link
Collaborator Author

hplato commented Mar 21, 2017

I have no idea why 45 commits got added to change a single file. The end result looks OK, however don't know if this might cause issues.

@hollie
Copy link
Owner

hollie commented Mar 21, 2017

Look OK to me, these are the same changes that were applied to master too, so I'll merge!

@hollie hollie merged commit 889bab0 into hollie:master Mar 21, 2017
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