Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	lib/index.js
#	package.json
  • Loading branch information
Erin Doyle committed Jun 1, 2017
2 parents dcde81d + 64fe62c commit b3130b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
Empty file added lib/index.js
Empty file.
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"name": "react-a11y-alt",
"name": "react-a11y",
"version": "0.3.5",
"description": "Warns about potential accessibility issues with your React elements.",
"main": "./lib/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/romeovs/react-a11y.git"
},
"homepage": "https://github.com/romeovs/react-a11y/blob/master/README.md",
"bugs": {
"url": "https://github.com/romeovs/react-a11y/issues"
"url": "https://github.com/reactjs/react-a11y.git"
},
"homepage": "https://github.com/reactjs/react-a11y/blob/latest/README.md",
"bugs": "https://github.com/reactjs/react-a11y/issues",
"scripts": {
"test": "npm run mocha # && npm run karma # commenting out karma until failing test is fixed",
"docs": "mkdir -p docs/rules && babel-node mkdocs.js",
Expand Down

0 comments on commit b3130b4

Please sign in to comment.