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

Feature A #2

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Feature A #2

wants to merge 15 commits into from

Commits on Oct 24, 2016

  1. add affiliation as attribute into json file

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    b73e779 View commit details
    Browse the repository at this point in the history

  2. add starfighter json file

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    79fd56b View commit details
    Browse the repository at this point in the history

  3. add designer

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    a06b744 View commit details
    Browse the repository at this point in the history

  4. add me as designer

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    be9a595 View commit details
    Browse the repository at this point in the history

  5. this is a test for commits

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    e8d1e43 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'f2' into develop... seems like we need a merge commit

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    9d10820 View commit details
    Browse the repository at this point in the history

  7. fixed merge conflicts for deathstar

    @gheemads
    gheemads committed Oct 24, 2016
    Configuration menu
    Copy the full SHA
    43f8ab9 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. test commit

    Aditya committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    a979ad4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'adit_f1' into develop 

    text
    Aditya committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    ae5ee24 View commit details
    Browse the repository at this point in the history

  3. commit from branch f1

    Aditya committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    f32cc67 View commit details
    Browse the repository at this point in the history

  4. changes from f2 branch

    Aditya committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    3efb933 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'f2' into develop 

    add command message
    Aditya committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    02ac554 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2016

  1. Squash commits from: 

    - Add new json file
- Add value to the json file
- Add another value to json file
    @suhendra-ep
    suhendra-ep committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    90f18ac View commit details
    Browse the repository at this point in the history

  2. Add new key on the json file

    @suhendra-ep
    suhendra-ep committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    bbc09dd View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Update new.json

    @suhendra-ep
    suhendra-ep authored Nov 16, 2016
    Configuration menu
    Copy the full SHA
    c4169d3 View commit details
    Browse the repository at this point in the history