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

Add proxy for my username #18

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

Add proxy for my username #18

wants to merge 7 commits into from

Commits on Jun 27, 2014

  1. Add username trenpixster

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    8d5798f View commit details
    Browse the repository at this point in the history

  2. Add trenpixster user to participants fixture

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    453b989 View commit details
    Browse the repository at this point in the history

  3. Add tests directory to trenpixster user

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    db2e35e View commit details
    Browse the repository at this point in the history

  4. Add proxy url

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    86a4e3c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/nvcexploder/hapi-lxjs 

    Conflicts:
	friday-participants.json
    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    711a7ab View commit details
    Browse the repository at this point in the history

  6. Add my username

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    c8c2380 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into add-proxy

    @trenpixster
    trenpixster committed Jun 27, 2014
    Configuration menu
    Copy the full SHA
    378b484 View commit details
    Browse the repository at this point in the history