Merge remote-tracking branch 'origin/master'

# Conflicts: # customer_profile_test.go # fraud_management_test.go # payment_transactions_test.go # recurring_billing.go # recurring_billing_test.go # transaction_reporting.go # transaction_reporting_test.go
hunterlong · Apr 12, 2017 · 9916599 · 9916599
2 parents 7bf27ec + 313ca2b
commit 9916599
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@ language: go
 
 os:
   - linux
-  - osx
 
 go:
   - 1.5