Skip to content

fix merge problems #389

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Nov 24, 2018
Merged

fix merge problems #389

merged 6 commits into from
Nov 24, 2018

Conversation

@dbusel
Copy link
Contributor

@dbusel dbusel commented Nov 24, 2018

No description provided.

dbusel and others added 6 commits November 22, 2018 18:23
@dbusel
22.11 release version 1.0.19 (#383)
2b3d687 
* EWC-359 `controller status` returns real status (online/offline)

* Revert "EWC-359 `controller status` returns real status (online/offline)"

* db migration calls before start instead of 'on starting' callback (#381)

* connector cert fix  (#382)

* fixed production config & version 1.0.19 (#379)
@dbusel
build(packaging): change build configurations (#388)
89957c3 
update package.json and travis.yml in order to automate npm package build and create github release
@dbusel
Update .travis.yml
413d77a
@dbusel
fix detached head problem
71efcc9
Release 1.0.20 [skip ci]
deff8cb
@dbusel
Merge branch 'develop' into master
40c6291
@dbusel dbusel merged commit 647e914 into develop Nov 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dbusel