Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin

2017-10-09 17:20:23 +02:00
parent d046b9ce33 21f1a48380
commit 128c9c2f4e
3 changed files with 6 additions and 15 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -558,8 +558,7 @@ define([
                            placeholder: Msg.login_password,
                        }),
                        h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login),
-                            h('button#register.btn.register.cp-login-register', Msg.login_register)
+                            h('button.login.first.btn', Msg.login_login)
                        ])
                    ])
                ]),