HomePhabricator

Merge branch 'develop' into bug/T159547

Authored by JoeWalsh on Mar 3 2017, 8:31 PM.

Description

Merge branch 'develop' into bug/T159547

Merged Changes

CommitAuthorDetailsCommitted
0501a8e19b5fJoeWalsh
remove carthage checkouts from project, reverts pr 1229 
Mar 3 2017
3cd1d1974a0bmontehurd/GitHub
Merge pull request #1236 from wikimedia/bug/T158927 
Mar 3 2017
83e3106461fbJoeWalsh/GitHub
Merge branch 'develop' into bug/T158927 
Mar 3 2017
065702727d28Andrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T158927 
Mar 3 2017
e16a5e86a8cfAndrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T158927 
Mar 3 2017
3ab0f3bad47aJoeWalsh
don't copy the assets folder 
Mar 3 2017