This repository has been archived by the owner. It is now read-only.
Firefox merge v11 #35
Merged
+10,499
−3,421
Conversation
# Conflicts: # Cartfile # Cartfile.resolved # Client.xcodeproj/project.pbxproj # Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme # Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme # Client/Application/AppDelegate.swift # Client/Application/LeanplumIntegration.swift # Client/Assets/MainFrameAtDocumentEnd.js # Client/Assets/MainFrameAtDocumentStart.js # Client/Frontend/Browser/BrowserViewController.swift # Client/Frontend/Browser/TabLocationView.swift # Client/Info.plist # Extensions/NotificationService/Info.plist # Extensions/SendTo/Info.plist # Extensions/ShareTo/Info.plist # Extensions/Today/Info.plist # Extensions/ViewLater/Info.plist # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/BuddyBuildSDK # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/Headers/BuddyBuildSDK.h # ThirdParty/BuddyBuild/BuddyBuildSDK.framework/build.num # ThirdParty/Leanplum/Leanplum.framework/Headers/LPInbox.h # ThirdParty/Leanplum/Leanplum.framework/Headers/Leanplum.h # ThirdParty/Leanplum/Leanplum.framework/Info.plist # ThirdParty/Leanplum/Leanplum.framework/Leanplum # ThirdParty/Leanplum/Leanplum.framework/Modules/module.modulemap # fastlane/actions/import_build_tools.rb # package.json
timoteipalade
merged commit ef5a662
into
master
1 check was pending
1 check was pending
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
No description provided.