Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-10-09 17:30:14 +02:00
parent f4189f883e 128c9c2f4e
commit c985aa60aa
6 changed files with 12 additions and 16 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)
                        ])
                    ])
                ]),