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

Competition+sport event #16

Merged
merged 5 commits into from
Oct 29, 2017
Merged

Competition+sport event #16

merged 5 commits into from
Oct 29, 2017

Commits on Oct 26, 2017

  1. SportEvent entity created, Competition entity modified, dao for Compe… 

    …tition and SportEvent added
    Lenoch committed Oct 26, 2017
    Configuration menu
    Copy the full SHA
    8293d8d View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2017

  1. Conflicts solved, ready to pull test-competition 

    Merge branch 'test-competition' of https://github.com/jiritobias/SportEventManager into Competition+SportEvent
    Lenoch committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    b3ddce1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/jiritobias/SportEventManager 

     into Competition+SportEvent
    Lenoch committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    250e434 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/jiritobias/SportEventManager 

     into Competition+SportEvent
    Lenoch committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    24d9e8f View commit details
    Browse the repository at this point in the history

  4. Pulled master to this branch

    Lenoch committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    6f7003c View commit details
    Browse the repository at this point in the history