Merge remote-tracking branch 'origin/new-ux' into new-ux

# Conflicts: # ooniprobe.xcworkspace/xcuserdata/lorenzo.xcuserdatad/xcdebugger/Breakpoi nts_v2.xcbkptlist
ooni · Jan 25, 2017 · 3a04f1b · 3a04f1b
2 parents 2cdfc77 + 54b96ad
commit 3a04f1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 /ooniprobe.xcodeproj/xcuserdata
 /ooniprobe.xcworkspace/xcuserdata/
 /Pods/
+
+ooniprobe.xcworkspace/xcuserdata/lorenzo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/ooniprobe.xcworkspace/xcuserdata/lorenzo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ooniprobe.xcworkspace/xcuserdata/lorenzo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist