Skip to content
This repository has been archived by the owner on Oct 7, 2020. It is now read-only.

Update convergance #7

Merged
merged 3 commits into from
May 15, 2015
Merged

Update convergance #7

merged 3 commits into from
May 15, 2015

Commits on May 1, 2015

  1. readme: initial temporary readme update 

    Update the repository README file to accurately reflect
the intent and nature of this repository. The original
io.js README is preserved as iojs_README.md.

This is temporary just while the convergence process
gets underway. Once the repository moves over to
the official organization, this can be reverted back to
an actual project README that accurately reflects the
combined projects.

Reviewed-By: @jasnell James M Snell <[email protected]>
Reviewed-By: @Fishrock123 Jeremiah Senkpiel
PR-URL: nodejs/node-convergence-archive#4
    @jasnell
    jasnell committed May 1, 2015
    Configuration menu
    Copy the full SHA
    522887f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2015

  1. Merge from iojs/master 

    Conflicts:
	README.md
    @Fishrock123
    Fishrock123 committed May 5, 2015
    Configuration menu
    Copy the full SHA
    511f27e View commit details
    Browse the repository at this point in the history

Commits on May 14, 2015

  1. Merge from io/js master 

    Conflicts:
	README.md
    @Fishrock123
    Fishrock123 committed May 14, 2015
    Configuration menu
    Copy the full SHA
    8e6bd77 View commit details
    Browse the repository at this point in the history