Merge branch 'master' into master

pull/35/head
Lyn Perrine 6 years ago committed by GitHub
commit 759840e0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -13,10 +13,6 @@ Screenshot
----------
.. image:: abiword.png
:width: 80%
<<<<<<< HEAD
=======
>>>>>>> eb44904c3fb6a917d77b28527c856bccd5241748
Useage
------

Loading…
Cancel
Save