HomePhabricator

Merge branch 'develop' into feature/T159907

Authored by JoeWalsh on Mar 14 2017, 8:48 PM.

Description

Merge branch 'develop' into feature/T159907

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

Merged Changes

CommitAuthorDetailsCommitted
b612148948c4JoeWalsh/GitHub
Merge pull request #1279 from wikimedia/color-extension 
Mar 14 2017
e749a4b1476dMhurd
Fix accidental comment. 
Mar 14 2017
c9d092848b36Mhurd
Merge branch 'develop' into color-extension 
Mar 14 2017
cc74e73a4dd9Mhurd
Use lower case hex strings consistently. 
Mar 12 2017
c6a5e0fcf01cMhurd
MOAR Swift type inference. 
Mar 11 2017
8631e01d6060Mhurd
Use Swifty colors. 
Mar 11 2017
5daaadd0a16cMhurd
Refactor UIColor+WMFStyle colors Swift. 
Mar 11 2017