Skip to content
Jump to bottom

John's branch #28

Merged
merged 3 commits into from Feb 24, 2017
Merged

John's branch #28

merged 3 commits into from Feb 24, 2017

Commits on Feb 24, 2017

  1. test commit to remove whatever the fuck I did earlier

    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    00da908 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master' into 

    John's-Branch

# Conflicts:
#	WebContent/html/javascript/listing.jsp
    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    f72173c View commit details
    Browse the repository at this point in the history

  3. got the listed devices page to show all devices

    @jic13003
    jic13003 committed Feb 24, 2017
    Copy the full SHA
    fb681c7 View commit details
    Browse the repository at this point in the history