Merge master into branch

2014-09-04 18:08:18 -04:00 · 2014-09-04 18:08:18 -04:00 · e028d4ae0a
commit e028d4ae0a
parent 1c2de35f28 bf3077f922
103 changed files with 2319 additions and 1187 deletions
--- a/static/directives/signup-form.html
+++ b/static/directives/signup-form.html
@ -20,7 +20,6 @@
      </span>
      <div class="external-login-button" provider="github"></div>
      <div class="external-login-button" provider="google"></div>
-      <p class="help-block" quay-require="['BILLING']">No credit card required.</p>
    </div>
  </form>
  <div ng-show="registering" style="text-align: center">