Skip to content

Commit af9a085

Browse files
committed
Merge remote-tracking branch 'upstream/6.7.fb' into Merge-6.7.3
2 parents d0f9b5c + 0915c99 commit af9a085

File tree

550 files changed

+36621
-16254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+36621
-16254
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ fbcode/
8080
fbcode
8181
travis-build/
8282
buckifier/*.pyc
83+
buckifier/__pycache__

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ os:
55
- linux
66
compiler:
77
- gcc
8-
osx_image: xcode8.3
8+
osx_image: xcode9.4
99
jdk:
1010
- openjdk7
1111
cache:

0 commit comments

Comments
 (0)