Merge branch 'master' of github.com:zixaphir/appchan-x

Conflicts: src/Posting/QR.captcha.coffee
2014-02-16 02:22:48 -07:00 · 2014-02-16 02:22:48 -07:00 · 979650f745
commit 979650f745
parent d11b435134 7f04240126
1 changed files with 1 additions and 1 deletions
--- a/src/Posting/QR.captcha.coffee
+++ b/src/Posting/QR.captcha.coffee
@ -138,4 +138,4 @@ QR.captcha =
      @save()
    else
      return
-    e.preventDefault()
+    e.preventDefault()