aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README20
1 files changed, 20 insertions, 0 deletions
diff --git a/README b/README
index e3f1ef551..9a6c94ed6 100644
--- a/README
+++ b/README
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+GNU Taler WebExtension Wallet
+=============================
+
+Cross-browser GNU Taler wallet written for the WebExtensions API.
+
+=======
TALER WALLET
Description
@@ -27,6 +34,7 @@ libgnunetutil
libgnunetjson
libgcrypt
libunistring
+>>>>>>> 6805b47b82c97af497a4b24b8b26f85c1eb5ab59
Installation
============
@@ -34,6 +42,18 @@ Installation
Run `./configure && make' to create an archive
containing the extension in ./build/taler-wallet-$VERSION.zip
+Dependencies
+============
+
+This project has the following third-party runtime dependencies:
+
+* URI.js: URL parsing and construction
+* mithril.js: view-layer based on virtual DOMs
+* jed: gettext parsing for JavaScript
+* lodash: standard helper library for JavaScript
+* system.js: Module loader for browsers that don't support
+ ES6 modules
+
Documentation
=============