Skip to content
This repository has been archived by the owner on Nov 21, 2018. It is now read-only.

Adds iojs-no localization (via subtree) #136 #256

Merged
merged 5 commits into from
Mar 3, 2015

Conversation

snostorm
Copy link
Contributor

@snostorm snostorm commented Mar 2, 2015

You'd never really know this was tracking from a subtree, but it is. Test for #136

@Starefossen
Copy link
Member

LGTM

@snostorm
Copy link
Contributor Author

snostorm commented Mar 3, 2015

@Fishrock123 so would you disagree with the inclusion of public in this case, or were you referring to other instances where which are wider in scope?

Conflicts:
	public/no/es6.html
	public/no/index.html
snostorm added a commit that referenced this pull request Mar 3, 2015
Adds iojs-no localization (via subtree) #136
@snostorm snostorm merged commit 5f96a23 into master Mar 3, 2015
@snostorm snostorm deleted the iojs-no_website_subtree branch March 13, 2015 20:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants