Skip to content

Commit 36ef0fc

Browse files
committed
Merge branch '2.1' of github.com:Codeception/Codeception into 2.1
2 parents 105af4e + c81129c commit 36ef0fc

18 files changed

Lines changed: 19 additions & 20 deletions

File tree

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
},
5555
"extra": {
5656
"branch-alias": {
57-
"dev-master": "2.1-dev"
5857
}
5958
},
6059
"bin":["codecept"]

docs/modules/Laravel4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ For example, given this sample "Sign Up" form:
11581158
<input type="text" name="user[login]" /><br/>
11591159
Password:
11601160
<input type="password" name="user[password]" /><br/>
1161-
Do you agree to out terms?
1161+
Do you agree to our terms?
11621162
<input type="checkbox" name="user[agree]" /><br/>
11631163
Select pricing plan:
11641164
<select name="plan">

docs/modules/Laravel5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ For example, given this sample "Sign Up" form:
10811081
<input type="text" name="user[login]" /><br/>
10821082
Password:
10831083
<input type="password" name="user[password]" /><br/>
1084-
Do you agree to out terms?
1084+
Do you agree to our terms?
10851085
<input type="checkbox" name="user[agree]" /><br/>
10861086
Select pricing plan:
10871087
<select name="plan">

docs/modules/Lumen.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ For example, given this sample "Sign Up" form:
959959
<input type="text" name="user[login]" /><br/>
960960
Password:
961961
<input type="password" name="user[password]" /><br/>
962-
Do you agree to out terms?
962+
Do you agree to our terms?
963963
<input type="checkbox" name="user[agree]" /><br/>
964964
Select pricing plan:
965965
<select name="plan">

docs/modules/Phalcon1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ For example, given this sample "Sign Up" form:
944944
<input type="text" name="user[login]" /><br/>
945945
Password:
946946
<input type="password" name="user[password]" /><br/>
947-
Do you agree to out terms?
947+
Do you agree to our terms?
948948
<input type="checkbox" name="user[agree]" /><br/>
949949
Select pricing plan:
950950
<select name="plan">

docs/modules/PhpBrowser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ For example, given this sample "Sign Up" form:
929929
<input type="text" name="user[login]" /><br/>
930930
Password:
931931
<input type="password" name="user[password]" /><br/>
932-
Do you agree to out terms?
932+
Do you agree to our terms?
933933
<input type="checkbox" name="user[agree]" /><br/>
934934
Select pricing plan:
935935
<select name="plan">

docs/modules/Silex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ For example, given this sample "Sign Up" form:
845845
<input type="text" name="user[login]" /><br/>
846846
Password:
847847
<input type="password" name="user[password]" /><br/>
848-
Do you agree to out terms?
848+
Do you agree to our terms?
849849
<input type="checkbox" name="user[agree]" /><br/>
850850
Select pricing plan:
851851
<select name="plan">

docs/modules/Symfony2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ For example, given this sample "Sign Up" form:
868868
<input type="text" name="user[login]" /><br/>
869869
Password:
870870
<input type="password" name="user[password]" /><br/>
871-
Do you agree to out terms?
871+
Do you agree to our terms?
872872
<input type="checkbox" name="user[agree]" /><br/>
873873
Select pricing plan:
874874
<select name="plan">

docs/modules/WebDriver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ For example, given this sample "Sign Up" form:
11291129
<input type="text" name="user[login]" /><br/>
11301130
Password:
11311131
<input type="password" name="user[password]" /><br/>
1132-
Do you agree to out terms?
1132+
Do you agree to our terms?
11331133
<input type="checkbox" name="user[agree]" /><br/>
11341134
Select pricing plan:
11351135
<select name="plan">

docs/modules/Yii1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ For example, given this sample "Sign Up" form:
855855
<input type="text" name="user[login]" /><br/>
856856
Password:
857857
<input type="password" name="user[password]" /><br/>
858-
Do you agree to out terms?
858+
Do you agree to our terms?
859859
<input type="checkbox" name="user[agree]" /><br/>
860860
Select pricing plan:
861861
<select name="plan">

0 commit comments

Comments
 (0)