HomePhabricator

Merge branch 'develop' into feature/2FA-scratch-codes/T158241

Authored by montehurd <montehurd@users.noreply.github.com> on Mar 8 2017, 9:19 PM.

Description

Merge branch 'develop' into feature/2FA-scratch-codes/T158241

Merged Changes

CommitAuthorDetailsCommitted
5d41c9040416JoeWalsh/GitHub
Merge pull request #1265 from wikimedia/bug/T154035-distance-squish 
Mar 8 2017
a7abc0c163ceAndrew Mroczkowski/GitHub
Merge branch 'develop' into bug/T154035-distance-squish 
Mar 8 2017
5692f37c48fbAndrew Mroczkowski
Limiting lines to 3 and setting tail truncation on attributed string 
Mar 8 2017