Merge pull request #884 from nextcloud/backport/882/stable-2.10

[stable-2.10] drone: Use master branch for files_lock

.drone.yml

@@ -122,7 +122,7 @@ services:
       - su www-data -c "git clone -b master https://github.com/nextcloud/external/  /var/www/html/apps/external/"
       - su www-data -c "php /var/www/html/occ app:enable external"
       - su www-data -c 'php /var/www/html/occ config:app:set external sites --value="{\"1\":{\"id\":1,\"name\":\"Nextcloud\",\"url\":\"https:\/\/www.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false},\"2\":{\"id\":2,\"name\":\"Forum\",\"url\":\"https:\/\/help.nextcloud.com\",\"lang\":\"\",\"type\":\"link\",\"device\":\"\",\"icon\":\"external.svg\",\"groups\":[],\"redirect\":false}}"'
-      - su www-data -c "git clone -b enh/collaborative-lock https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/"
+      - su www-data -c "git clone -b master https://github.com/nextcloud/files_lock.git /var/www/html/apps/files_lock/"
       - su www-data -c "php /var/www/html/occ app:enable -f files_lock"
       - /usr/local/bin/run.sh