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

Final submission #5

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

Final submission #5

wants to merge 10 commits into from

Commits on May 15, 2014

  1. fixing to header

    @jasonfish568
    jasonfish568 committed May 15, 2014
    Configuration menu
    Copy the full SHA
    fa1c0fb View commit details
    Browse the repository at this point in the history

  2. commit

    @jasonfish568
    jasonfish568 committed May 15, 2014
    Configuration menu
    Copy the full SHA
    5f60002 View commit details
    Browse the repository at this point in the history

  3. update

    @jasonfish568
    jasonfish568 committed May 15, 2014
    Configuration menu
    Copy the full SHA
    c2d2ec6 View commit details
    Browse the repository at this point in the history

  4. changed to sha1

    @jasonfish568
    jasonfish568 committed May 15, 2014
    Configuration menu
    Copy the full SHA
    54b495e View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. Merge pull request #11 from comfortablejohn/master 

    semi-final
    @jasonfish568
    jasonfish568 committed May 16, 2014
    Configuration menu
    Copy the full SHA
    836d6e6 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2014

  1. Merge pull request #12 from comfortablejohn/master 

    rearranged directory structre
    @jasonfish568
    jasonfish568 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    f675438 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from comfortablejohn/master 

    added/rm missing and restructured files from git
    @jasonfish568
    jasonfish568 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    b51ca13 View commit details
    Browse the repository at this point in the history

  3. final change

    @jasonfish568
    jasonfish568 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    7f787cb View commit details
    Browse the repository at this point in the history

  4. final submit

    @jasonfish568
    jasonfish568 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    b5e14e7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ring-of-trust' 

    Conflicts:
	client/client.pem
	server/server.pem
    @jasonfish568
    jasonfish568 committed May 22, 2014
    Configuration menu
    Copy the full SHA
    2beb55d View commit details
    Browse the repository at this point in the history