merge to master

2017-07-04 14:19:08 +02:00 · 2017-07-04 14:19:08 +02:00 · 43d4597f38
parent 34fd6f4285 d72acec915
commit 43d4597f38
17 changed files with 0 additions and 1 deletions
--- a/bower.json
+++ b/bower.json
@ -34,7 +34,6 @@
    "chainpad-crypto": "^0.1.3",
    "chainpad-listmap": "^0.3.0",
    "file-saver": "1.3.1",
-    "diff-dom": "~2.1.1",
    "alertifyjs": "1.0.11",
    "scrypt-async": "1.2.0",
    "require-css": "0.1.10",
--- a/customize.dist/alt-favicon.png
+++ b/customize.dist/alt-favicon.png
--- a/customize.dist/bg3.jpg
+++ b/customize.dist/bg3.jpg
--- a/customize.dist/cryptofist_mini.png
+++ b/customize.dist/cryptofist_mini.png
--- a/customize.dist/cryptofist_small.png
+++ b/customize.dist/cryptofist_small.png
--- a/customize.dist/images/code.png
+++ b/customize.dist/images/code.png
--- a/customize.dist/images/hash.png
+++ b/customize.dist/images/hash.png
--- a/customize.dist/images/key_small.png
+++ b/customize.dist/images/key_small.png
--- a/customize.dist/images/organize.png
+++ b/customize.dist/images/organize.png
--- a/customize.dist/images/pad.png
+++ b/customize.dist/images/pad.png
--- a/customize.dist/images/poll.png
+++ b/customize.dist/images/poll.png
--- a/customize.dist/images/realtime_small.png
+++ b/customize.dist/images/realtime_small.png
--- a/customize.dist/images/slide.png
+++ b/customize.dist/images/slide.png
--- a/customize.dist/images/useraccount.png
+++ b/customize.dist/images/useraccount.png
--- a/customize.dist/images/zeroknowledge_small.png
+++ b/customize.dist/images/zeroknowledge_small.png
--- a/customize.dist/images/zk.png
+++ b/customize.dist/images/zk.png
--- a/customize.dist/main-favicon.png
+++ b/customize.dist/main-favicon.png