catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge conflicts.

Browse source
This commit is contained in:
Steve Pulec 2016-12-03 19:40:39 -05:00
commit a39f30ad18
7 changed files with 582 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -43,3 +43,4 @@ Moto is written by Steve Pulec with contributions from:
* [Dustin J. Mitchell](https://github.com/djmitche)
* [Jean-Baptiste Barth](https://github.com/jbbarth)
* [Tom Viner](https://github.com/tomviner)
* [Justin Wiley](https://github.com/SectorNine50)