Merge remote-tracking branch 'hamiltont/patch-2' into develop

This commit is contained in:
rembo10
2016-01-29 15:43:04 +00:00

View File

@@ -62,3 +62,7 @@ Album Page with track overview:
## License ## License
This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included. This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included.
Master Branch: [![Build Status](https://travis-ci.org/rembo10/headphones.svg?branch=master)](https://travis-ci.org/rembo10/headphones)
Develop Branch: [![Build Status](https://travis-ci.org/rembo10/headphones.svg?branch=develop)](https://travis-ci.org/rembo10/headphones)