Skip to content

Commit

Permalink
Merge branch 'master' into feat-executable
Browse files Browse the repository at this point in the history
Conflicts:
	README.rst
  • Loading branch information
musically-ut committed May 5, 2015
2 parents 5dbef6e + a08e1c7 commit 21341cc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -67,9 +67,9 @@ Tests
The tests can be run using ``nosetests`` (if all dependencies are
installed in the environment) or using ``python setup.py test``.

.. |BuildStatus| image:: https://api.travis-ci.org/musically-ut/seqfile.svg
.. |BuildStatus| image:: https://travis-ci.org/musically-ut/seqfile.svg?branch=master
:target: https://travis-ci.org/musically-ut/seqfile
.. |BuildStatusWin| image:: https://ci.appveyor.com/api/projects/status/6x28l2cgqupdjyue?svg=true
.. |BuildStatusWin| image:: https://ci.appveyor.com/api/projects/status/6x28l2cgqupdjyue/branch/master?svg=true
:target: https://ci.appveyor.com/project/musically-ut/seqfile
.. |Coverage| image:: https://coveralls.io/repos/musically-ut/seqfile/badge.svg?branch=master
:target: https://coveralls.io/r/musically-ut/seqfile?branch=master
Expand Down

0 comments on commit 21341cc

Please sign in to comment.