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

Updated Dockerfile #613

Merged
merged 3 commits into from
Mar 22, 2019
Merged

Updated Dockerfile #613

merged 3 commits into from
Mar 22, 2019

Commits on Mar 21, 2019

  1. - Fixed typo

    @tgiphil
    tgiphil committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    6282387 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. - Updating docker

    @tgiphil
    tgiphil committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    e335e1e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/mosa/MOSA-Project into 02… 

    …5-DockerFile

# Conflicts:
#	Resources/docker-integration/Dockerfile
    @tgiphil
    tgiphil committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    289991a View commit details
    Browse the repository at this point in the history