Merge pull request #1 from google/master

Authored by Kasper Weibel Nielsen-Refs <weibel@gmail.com> on Jul 4 2018, 7:07 AM.

Description

Merge pull request #1 from google/master

Merge downstream changes

Details

Committed
GitHub <noreply@github.com>Jul 4 2018, 7:07 AM
Parents
R23:91c27bb8a15e: Update CHANGELOG.md for swift fix of relase 1.14.0.
R23:890d5b2be7e1: Fix typo
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
91c27bb8a15eYan Zhang/Aditya Atul Tirodkar
Update CHANGELOG.md for swift fix of relase 1.14.0. 
Jun 4
c201f583934fYan Zhang/ khandpur
fix default Swift version in EarlGreyExampleSwiftTests xcode project 
Jun 4
ce2038fee2b0Lewis Lebentz/Aditya Atul Tirodkar
Update CONTRIBUTING.md 
Jun 4
247e10bf7c1cYan Zhang/ khandpur
Update CHANGELOG.md for relase 1.14.0. 
May 30
e5843b3ed534Yan Zhang/ khandpur
Update version number in docs and plist for 1.14.0. 
May 29
ec4d211079b3Aditya Atul Tirodkar/ khandpur
Revert "update version number in docs and plist for 1.13.1" 
May 29
c04d6469f59bYan Zhang/Aditya Atul Tirodkar
update version number in docs and plist for 1.13.1 
May 29
44a9a547ee5fYan Zhang/ khandpur
Minor format changes and doc updates 
May 25
028cb3f7023eYan Zhang/ khandpur
fix FTRLocalUIWebViewTest for testAJAXLoad 
May 25
373c3fc62b84Yan Zhang/ khandpur
Fix UIWebViewIdlingResource for PDF display. 
May 25
3c6ded403c84Yan Zhang/ khandpur
Fix swift projects and add Swift 4 and Swift 3 in the gem as the officially… 
May 25
34823e94d604ynzhang0509/GitHub
Merge pull request #712 from ynzhang0509/sync 
May 23
e2397174807fYan Zhang
restore pull request: https://github.com/google/EarlGrey/pull/646 also fixed… 
May 22