From: Marcus <bubuiic@aol.com>
Date: Tue, 14 Nov 2017 01:38:19 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.9~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1ae4bd77b28c2849cab73163672c0cb3260e7a5d;hp=1fef00589ae0293f090c39337279228d199d78f4;p=fdroidserver.git

Merge branch 'master' into 'master'

Changed setup.py +x for easy invocation

Closes #410

See merge request fdroid/fdroidserver!371
---

diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755