Merge branch 'develop' into feature/entryFields
# Conflicts: # VDS.xcodeproj/project.pbxproj # VDS/Components/Label/Attributes/ActionLabelAttribute.swift Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
commit
78fa3f1486
@ -741,6 +741,7 @@
|
||||
EAF7F0B7289C12A600B287F5 /* UITapGestureRecognizer.swift in Sources */,
|
||||
EA3362452892F9130071C351 /* Labelable.swift in Sources */,
|
||||
EA3361AD288B26190071C351 /* DataTrackable.swift in Sources */,
|
||||
EAA5EEE228F4C62C003B3210 /* Colorable.swift in Sources */,
|
||||
EA33623E2892EE950071C351 /* UIDevice.swift in Sources */,
|
||||
EA3362302891EB4A0071C351 /* Fonts.swift in Sources */,
|
||||
EA1F265E28B944F00033E859 /* CollectionViewCell.swift in Sources */,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user