23d9853a71
# Conflicts: # CoreDataStack/Entity/Status.swift |
||
---|---|---|
.. | ||
Assets.xcassets | ||
Preview Assets.xcassets | ||
en.lproj |
23d9853a71
# Conflicts: # CoreDataStack/Entity/Status.swift |
||
---|---|---|
.. | ||
Assets.xcassets | ||
Preview Assets.xcassets | ||
en.lproj |