patch-1 #3

Open
dorian wants to merge 3 commits from patch-1 into master

3 commits

Author SHA1 Message Date
fed5806ed6 Merge branch 'master' into 'patch-1'
# Conflicts:
#   README.md
2018-06-29 20:15:50 +02:00
51fc8dba44 Update README.md 2018-06-29 20:14:22 +02:00
aa33639548 Update README.md 2018-06-29 15:30:29 +02:00