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

Redo PR to merge David Picture #19

Merged
merged 4 commits into from
Oct 2, 2018
Merged

Redo PR to merge David Picture #19

merged 4 commits into from
Oct 2, 2018

Commits on Oct 2, 2018

  1. Add lines to gitignore; Add prokarius picture

    @prokarius
    prokarius committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    ddb566c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/CS2103-AY1819S1-F10-2/main … 

    …into david-picture
    @prokarius
    prokarius committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    cd21501 View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict in AboutUs.adoc

    @prokarius
    prokarius committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    9a9d29f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into david-picture

    @OrangeJuice7
    OrangeJuice7 committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    d63f61f View commit details
    Browse the repository at this point in the history