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

Solange garrais #3

Open
wants to merge 41 commits into
base: master
Choose a base branch
from

Commits on Jan 16, 2020

  1. Configuration menu
    Copy the full SHA
    18b9418 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aaa7bd7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8400498 View commit details
    Browse the repository at this point in the history
  4. Creating conflict

    AntoineLegrain committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    283cf43 View commit details
    Browse the repository at this point in the history
  5. added conflict

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    5d5ea8b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b746e38 View commit details
    Browse the repository at this point in the history
  7. Files added from myspace

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    3f2407f View commit details
    Browse the repository at this point in the history
  8. conflict

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    05e4439 View commit details
    Browse the repository at this point in the history
  9. youshallnotpassmate

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    8a884f6 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    16074ae View commit details
    Browse the repository at this point in the history
  11. Shame on you.

    Trying to add more details.
    AntoineLegrain committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    269c8cb View commit details
    Browse the repository at this point in the history
  12. Merge branch 'myspace'

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    f3cfbd8 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f2815d2 View commit details
    Browse the repository at this point in the history
  14. Solve this conflict!

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    887ad63 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    0ca4ade View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    612ca0c View commit details
    Browse the repository at this point in the history
  17. Modif author_ Solange

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    9ed7c0d View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    177a1cf View commit details
    Browse the repository at this point in the history
  19. Challenge for you Solange!

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    687e5df View commit details
    Browse the repository at this point in the history
  20. Revert "Hey guys"

    AntoineLegrain authored Jan 16, 2020
    Configuration menu
    Copy the full SHA
    cc9177c View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    35530cf View commit details
    Browse the repository at this point in the history
  22. Solange

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    8db2e1f View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    db2ac09 View commit details
    Browse the repository at this point in the history
  24. Nice try!

    AntoineLegrain committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    fc37d1d View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    c945af1 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    5c45f8a View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    36ed7f9 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    7bc4fc1 View commit details
    Browse the repository at this point in the history
  29. Merge branch 'tree_branch'

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    8c10c86 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    faecdc3 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    9e06744 View commit details
    Browse the repository at this point in the history
  32. isthissolved

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    dfb0535 View commit details
    Browse the repository at this point in the history
  33. resolved

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    e50d42d View commit details
    Browse the repository at this point in the history
  34. add author Eugénie

    eugeniedionnet committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    cb736b7 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    983d998 View commit details
    Browse the repository at this point in the history
  36. fruit challenge

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    f2ddf66 View commit details
    Browse the repository at this point in the history
  37. delete_me added

    KwangilChi committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    1e2ec81 View commit details
    Browse the repository at this point in the history
  38. fromnewbranch

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    4e57bc0 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    dbd47e0 View commit details
    Browse the repository at this point in the history
  40. fix convert object

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    dfe841c View commit details
    Browse the repository at this point in the history
  41. convert objet

    SolangeGarrais committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    79b0554 View commit details
    Browse the repository at this point in the history