HomePhabricator

Merge branch 'develop' into spike/nsurlcomponentscategories/T133933

Description

Merge branch 'develop' into spike/nsurlcomponentscategories/T133933

  1. Conflicts:
  2. Wikipedia.xcodeproj/project.pbxproj

Details

Provenance
JoeWalshAuthored on Jun 14 2016, 6:55 PM
Parents
rAPIOSd870bc48b3ab: fix typo
rAPIOSb2743a3d0197: Merge pull request #712 from wikimedia/twn/06-13-2016
Branches
Unknown
Tags
Unknown
ChangeId
None

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.