Merge branch 'master' into dev

This commit is contained in:
Jeppe Klitgaard 2015-04-16 09:19:09 +02:00
commit af84a864c6

View File

@ -1,6 +1,6 @@
pyCraft
=======
.. image:: https://travis-ci.org/ammaraskar/pyCraft.svg
.. image:: https://travis-ci.org/ammaraskar/pyCraft.svg?branch=master
:target: https://travis-ci.org/ammaraskar/pyCraft
.. image:: https://readthedocs.org/projects/pycraft/badge/?version=latest
:target: https://pycraft.readthedocs.org/en/latest