manual merge

2017-08-10 15:38:09 +02:00
parent b3d349bf80 04b84538e1
commit e786a66ff3
3 changed files with 136 additions and 0 deletions
--- a/bower.json
+++ b/bower.json
@@ -41,5 +41,6 @@
    "bootstrap": "#v4.0.0-alpha.6",
    "diff-dom": "2.1.1",
    "nthen": "^0.1.5"
+    "open-sans-fontface": "^1.4.2"
  }
 }