Skip to content
This repository was archived by the owner on Nov 24, 2018. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OlympicCode/vHackAPI-Java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: angelbirth/vHackAPI-Java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 2, 2016

  1. Update to https 

    Merge branch 'master' of https://github.com/vHack-API/vHackAPI-Java

Conflicts:
	src/me/checkium/vhackapi/Utils.java
	src/me/checkium/vhackapi/console/Console.java
	src/me/checkium/vhackapi/vHackAPI.java
    @angelbirth
    angelbirth committed Sep 2, 2016
    Configuration menu
    Copy the full SHA
    bd60969 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    Conflicts:
	src/me/checkium/vhackapi/Utils.java
    @angelbirth
    angelbirth committed Sep 2, 2016
    Configuration menu
    Copy the full SHA
    9fda903 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2016

  1. Further cleaning up 

    - add feature scan single IP in Console
- moved SSL preparation stuffs to static initializers in Utils
    @angelbirth
    angelbirth committed Sep 3, 2016
    Configuration menu
    Copy the full SHA
    63caa93 View commit details
    Browse the repository at this point in the history
Loading