Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

1 files changed, 1 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index 8ca0eaf..a346afa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,4 +29,4 @@ group :test do
 end
 
 # unreleased so far ... but leap_web_certs need it
-gem 'certificate_authority', :git => 'git://github.com/cchandler/certificate_authority.git'
+gem 'certificate_authority', :git => 'https://github.com/cchandler/certificate_authority.git'