summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-14 01:06:25 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2016-06-14 01:06:25 +0200
commitae02685e6f31d9922dbfeb758f41556369e55864 (patch)
treecb14b4fe9374bf7d7448f4326758a7a428b6e335 /build
parentd0e4727ecdc317e65be5705cbbbeb61793aa9a03 (diff)
parent990ac34aaa707652614820848e6b740763936831 (diff)
downloadnextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.tar.gz
nextcloud-server-ae02685e6f31d9922dbfeb758f41556369e55864.zip
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614
Diffstat (limited to 'build')
-rw-r--r--build/integration/features/sharing-v1.feature2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/integration/features/sharing-v1.feature b/build/integration/features/sharing-v1.feature
index 79d7617f024..79dc1326f3c 100644
--- a/build/integration/features/sharing-v1.feature
+++ b/build/integration/features/sharing-v1.feature
@@ -685,7 +685,7 @@ Feature: sharing
|{http://open-collaboration-services.org/ns}share-permissions |
Then the single response should contain a property "{http://open-collaboration-services.org/ns}share-permissions" with value "15"
- Scenario: unique target names for incomming shares
+ Scenario: unique target names for incoming shares
Given user "user0" exists
And user "user1" exists
And user "user2" exists