Ricardo Sánchez-Sáez 0459818613 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules ...

# Conflicts:
#	Testing/ORKTest/ORKTest.xcodeproj/project.pbxproj
#	Testing/ORKTest/ORKTest/MainViewController.m

2015-10-26 22:43:35 +00:00

..

project.xcworkspace

Initial commit

2015-04-14 00:02:43 -07:00

xcshareddata/xcschemes

Merge branch 'master' into ios9

2015-08-18 23:28:57 -07:00

project.pbxproj

Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules

2015-10-26 22:43:35 +00:00