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

our presentation project #1

Open
wants to merge 2 commits into
base: usermanagement
Choose a base branch
from
Open

our presentation project #1

wants to merge 2 commits into from

Commits on Apr 25, 2015

  1. fix conflicts with usermanagement

    @Vadimka29
    Vadimka29 committed Apr 25, 2015
    Configuration menu
    Copy the full SHA
    7afc465 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2015

  1. Merge remote-tracking branch 'origin/usermanagement' into stable 

    Conflicts:
	presentation/src/main/java/ua/com/tracksee/servlets/admin/HomeAdminServlet.java
    @Vadimka29
    Vadimka29 committed May 4, 2015
    Configuration menu
    Copy the full SHA
    e17bd0a View commit details
    Browse the repository at this point in the history