Aaron Schubert b586b9f34b Fix merge conflicts

2016-04-21 09:26:40 +01:00

..

project.xcworkspace

use current-branch in carthage build

2016-03-17 15:00:32 +01:00

xcshareddata/xcschemes

[Xcode Project] Add new file to the framework target. Update to recommended build settings to resolve 1 of 1 warnings.

2016-03-08 22:58:27 -08:00

project.pbxproj

Fix merge conflicts

2016-04-21 09:26:40 +01:00