John Rommel Estropia fe69e7c6c4 Merge branch 'prototype/Swift_4_0' into prototype/queryBuilders ...

# Conflicts:
#	CoreStore.xcodeproj/project.pbxproj
#	Sources/Relationship.swift
#	Sources/Value.swift

2017-08-05 23:02:00 +09:00

..

project.xcworkspace

Fixes #98 (deadlock when merge happens while main queue is querying)

2016-09-29 14:47:51 -04:00

xcshareddata/xcschemes

relationships done!

2017-04-06 20:28:17 +09:00

project.pbxproj

Merge branch 'prototype/Swift_4_0' into prototype/queryBuilders

2017-08-05 23:02:00 +09:00