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

2019-04-09 16:29:59 +02:00
parent 87d9ddc611 9c4ae61550
commit 92d87787c9
5 changed files with 60 additions and 8 deletions
--- a/customize.dist/images/twiitter.svg
+++ b/customize.dist/images/twiitter.svg
--- a/customize.dist/pages/contact.js
+++ b/customize.dist/pages/contact.js
@@ -38,7 +38,8 @@ define([
                        h('a.card', {href : "https://twitter.com/cryptpad"}, 
                            h('div.card-body',
                                h('p', [
-                                    h('img', {src: '/customize/images/twitter.svg'}),
+                                    // this is not a typo. adblock plus blocks images with src *twitter* apparently
+                                    h('img', {src: '/customize/images/twiitter.svg'}),
                                    'Twitter'
                                ])
                            )