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

Some small internal fixes #39

Merged
merged 8 commits into from
Jun 8, 2016
Merged

Some small internal fixes #39

merged 8 commits into from
Jun 8, 2016

Commits on Jun 6, 2016

  1. Moved 'rapport' in employee's view

    @Scriptodude
    Scriptodude committed Jun 6, 2016
    Configuration menu
    Copy the full SHA
    0ae99ea View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Rebased branch to AESS's develop

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    3ead5e3 View commit details
    Browse the repository at this point in the history

  2. Commented corsheader 

    Updated .gitignore

Added omit to .travis.yml
    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    4553f21 View commit details
    Browse the repository at this point in the history

  3. Rebased branch to AESS's develop

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    9f083e9 View commit details
    Browse the repository at this point in the history

  4. Added omit to .travis.yml

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    8599888 View commit details
    Browse the repository at this point in the history

  5. Conflict #1 - Commented rather than removed

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    5b89566 View commit details
    Browse the repository at this point in the history

  6. Update .travis.yml

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    1c02412 View commit details
    Browse the repository at this point in the history

  7. Rebased branch to AESS's develop

    @Scriptodude
    Scriptodude committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    60b8f1e View commit details
    Browse the repository at this point in the history