Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/mrkipling/maraschino
Browse files Browse the repository at this point in the history
  • Loading branch information
N3MIS15 committed Sep 7, 2012
2 parents 6dc646d + d63692c commit f92ef28
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

* **Author**: [Bradley Abrahams](https://github.com/mrkipling)

* **Main collaborator**: [Gustavo Hoirisch](https://github.com/gugahoi)
* **Main collaborators**: [Gustavo Hoirisch](https://github.com/gugahoi) and [David Gray](https://github.com/N3MIS15)

##What is Maraschino?

Expand Down

0 comments on commit f92ef28

Please sign in to comment.