Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
SunburnedGoose committed May 18, 2015
2 parents 3147fe6 + 2b5525f commit 3e4576c
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 @@ -33,4 +33,4 @@ Follow the conversation on [reddit](http://www.reddit.com/r/DestinyItemManager/)
Chat with the developers on gitter.im. [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kyleshay/DIM?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge).

##License
Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE).
Code released under [the MIT license](http://choosealicense.com/licenses/mit/).

0 comments on commit 3e4576c

Please sign in to comment.