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.

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

Back Merge Master #411

Merged
merged 14 commits into from
Dec 19, 2018
Merged

Back Merge Master #411

merged 14 commits into from
Dec 19, 2018

Conversation

codyseibert
Copy link

No description provided.

codyseibert and others added 13 commits November 30, 2018 17:39
@codyseibert
Merge pull request #249 from flexion/staging
bb320ed 
Sprint 3 PR
@codyseibert
fixing bug where the docker container can not connect to the service …
61aa9cd 
…when using localhost
@sadlerw
Merge pull request #254 from flexion/task/fixing_host_bug
967aacb 
Fixing Host Issue
@codyseibert
addressing a lot of the PR comments of the sprint 3 PR
f07c118
@codyseibert
ability to stop container with ctrl c
b2abdc5
@codyseibert
change license
ed51fc3
@codyseibert
Merge pull request #272 from flexion/task/addressing_sprint_3_pr_comm…
96c47ab 
…ents

Sprint 3 - addressing a lot of the PR comments
@codyseibert
adding css to fix the pipe issue
641008a
@codyseibert
fixing lint issue
49820e5
@codyseibert
Merge pull request #275 from flexion/task/addressing_sprint_3_pr_pipe…
6209bec 
…_bug

adding css to fix the pipe issue
@codyseibert
fixing package json files
abcd99e
@codyseibert
Merge branch 'master' into task/back_merge_master
8a1f069
@codyseibert
fixing package lock
0a9f3c8
kkoskelin
kkoskelin approved these changes Dec 19, 2018
View reviewed changes
Copy link

@kkoskelin kkoskelin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, now we're good

@codyseibert codyseibert merged commit 66a4ab2 into staging Dec 19, 2018
@sadlerw sadlerw deleted the task/back_merge_master branch December 19, 2018 16:06
ericsorenson pushed a commit that referenced this pull request Sep 24, 2020
@mmarcotte
Merge pull request #411 from flexion/sprint-48.5
13d5ac7 
Sprint 48.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kkoskelin kkoskelin kkoskelin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@codyseibert @kkoskelin @sadlerw