Merge branch 'master' into add-husky-lintstaged

This commit is contained in:
Ritesh Kumar authored and GitHub committed 2017-09-15 01:12:16 +05:30
commit 6e6c134935
3 files changed
+12 -3

No files matched your search

+9
View File
@@ -109,6 +109,15 @@
"contributions": [
"code"
]
},
{
"login": "intabulas",
"name": "Mark Lussier",
"avatar_url": "https://avatars0.githubusercontent.com/u/448?v=4",
"profile": "http://www.twitter.com/intabulas",
"contributions": [
"code"
]
}
]
}
+2 -2
View File
@@ -30,8 +30,8 @@ export default class extends PureComponent {
return (
<Layout pathname={this.props.url.pathname}>
<ConversionPanel
leftTitle='JSON'
rightTitle='XML'
leftTitle='XML'
rightTitle='JSON'
getTransformedValue={this.getTransformedValue}
name={'big-query'}
defaultText={text}
+1 -1
View File
@@ -49,7 +49,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
| [<img src="https://avatars3.githubusercontent.com/u/5389035?v=4" width="100px;"/><br /><sub>Ritesh Kumar</sub>](http://riteshkr.com)<br />[📖](https://github.com/ritz078/transform-www/commits?author=ritz078 "Documentation") [💻](https://github.com/ritz078/transform-www/commits?author=ritz078 "Code") [🤔](#ideas-ritz078 "Ideas, Planning, & Feedback") [👀](#review-ritz078 "Reviewed Pull Requests") | [<img src="https://avatars2.githubusercontent.com/u/47542?v=4" width="100px;"/><br /><sub>Florian Gilcher</sub>](http://asquera.de)<br />[💻](https://github.com/ritz078/transform-www/commits?author=skade "Code") | [<img src="https://avatars1.githubusercontent.com/u/20063?v=4" width="100px;"/><br /><sub>Pascal Hertleif</sub>](http://pascalhertleif.de/)<br />[💻](https://github.com/ritz078/transform-www/commits?author=killercup "Code") | [<img src="https://avatars3.githubusercontent.com/u/534610?v=4" width="100px;"/><br /><sub>Lado Lomidze</sub>](http://landish.github.io)<br />[💻](https://github.com/ritz078/transform-www/commits?author=Landish "Code") | [<img src="https://avatars1.githubusercontent.com/u/13787614?v=4" width="100px;"/><br /><sub>Mattia Manzati</sub>](https://github.com/mattiamanzati)<br />[💻](https://github.com/ritz078/transform-www/commits?author=mattiamanzati "Code") | [<img src="https://avatars3.githubusercontent.com/u/12202757?v=4" width="100px;"/><br /><sub>Mohammad Rajabifard</sub>](https://tarino.ir)<br />[🤔](#ideas-morajabi "Ideas, Planning, & Feedback") [💻](https://github.com/ritz078/transform-www/commits?author=morajabi "Code") | [<img src="https://avatars0.githubusercontent.com/u/3108160?v=4" width="100px;"/><br /><sub>Raathigeshan Kugarajan</sub>](http://raathigesh.com/)<br />[💻](https://github.com/ritz078/transform-www/commits?author=Raathigesh "Code") |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars2.githubusercontent.com/u/5554486?v=4" width="100px;"/><br /><sub>Gyandeep Singh</sub>](https://gyandeeps.com)<br />[💻](https://github.com/ritz078/transform-www/commits?author=gyandeeps "Code") | [<img src="https://avatars2.githubusercontent.com/u/1128849?v=4" width="100px;"/><br /><sub>Matt Holt</sub>](https://matt.life)<br />[💻](https://github.com/ritz078/transform-www/commits?author=mholt "Code") | [<img src="https://avatars0.githubusercontent.com/u/2767425?v=4" width="100px;"/><br /><sub>sreenivas alapati</sub>](https://medium.com/@sreenivas)<br />[💻](https://github.com/ritz078/transform-www/commits?author=cg-cnu "Code") | [<img src="https://avatars2.githubusercontent.com/u/1761758?v=4" width="100px;"/><br /><sub>Boris Cherny</sub>](https://performancejs.com)<br />[💻](https://github.com/ritz078/transform-www/commits?author=bcherny "Code") |
| [<img src="https://avatars2.githubusercontent.com/u/5554486?v=4" width="100px;"/><br /><sub>Gyandeep Singh</sub>](https://gyandeeps.com)<br />[💻](https://github.com/ritz078/transform-www/commits?author=gyandeeps "Code") | [<img src="https://avatars2.githubusercontent.com/u/1128849?v=4" width="100px;"/><br /><sub>Matt Holt</sub>](https://matt.life)<br />[💻](https://github.com/ritz078/transform-www/commits?author=mholt "Code") | [<img src="https://avatars0.githubusercontent.com/u/2767425?v=4" width="100px;"/><br /><sub>sreenivas alapati</sub>](https://medium.com/@sreenivas)<br />[💻](https://github.com/ritz078/transform-www/commits?author=cg-cnu "Code") | [<img src="https://avatars2.githubusercontent.com/u/1761758?v=4" width="100px;"/><br /><sub>Boris Cherny</sub>](https://performancejs.com)<br />[💻](https://github.com/ritz078/transform-www/commits?author=bcherny "Code") | [<img src="https://avatars0.githubusercontent.com/u/448?v=4" width="100px;"/><br /><sub>Mark Lussier</sub>](http://www.twitter.com/intabulas)<br />[💻](https://github.com/ritz078/transform-www/commits?author=intabulas "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!