Merge branch 'release/2.0' into production

Conflicts: platforms/ios/TDA-Enrichment/Classes/AppDelegate.m platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist
deacons · Jan 9, 2015 · 845d1dd · 845d1dd
2 parents 3ff6dc5 + 1321123
commit 845d1dd
Show file tree

Hide file tree

Showing 373 changed files with 26,517 additions and 27,919 deletions.
diff --git a/.cordova/config.json b/.cordova/config.json
@@ -0,0 +1 @@
+{"id":"com.georgegarside.tda-enrichment","name":"TDA-Enrichment"}
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ build
 .DS_Store
 xcuserdata/
 *.diff
+Other Resources
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/TDA-Enrichment.iml b/.idea/TDA-Enrichment.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/jsLinters/jslint.xml b/.idea/jsLinters/jslint.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id":"com.georgegarside.tda-enrichment","name":"TDA-Enrichment"}