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

Wk4 gerkovink #136

Open
wants to merge 10 commits into
base: Wk4_gerkovink
Choose a base branch
from
Open

Wk4 gerkovink #136

wants to merge 10 commits into from

Commits on Nov 3, 2020

  1. Configuration menu
    Copy the full SHA
    156abd6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    242a2cd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0b0e787 View commit details
    Browse the repository at this point in the history
  4. Introduced conflict

    gerkovink committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    1d8fd34 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2020

  1. Configuration menu
    Copy the full SHA
    5bea3ed View commit details
    Browse the repository at this point in the history
  2. Merge pull request gerkovink#51 from gerkovink/gerkodev

    Introduced conflict
    gerkovink committed Nov 4, 2020
    Configuration menu
    Copy the full SHA
    79cbbd0 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2020

  1. Merge pull request gerkovink#47 from RianneKraakman/riannedev

    Added assignment 3
    gerkovink committed Nov 25, 2020
    Configuration menu
    Copy the full SHA
    95c6edd View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. everything in a single commit

    Corzina committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    037b5a4 View commit details
    Browse the repository at this point in the history
  2. conflict resolved

    Corzina committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    c2736e2 View commit details
    Browse the repository at this point in the history
  3. Ilya commit

    Corzina committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    f5bdf30 View commit details
    Browse the repository at this point in the history