From 8370b62870a3100e126e6434a09eb518c26dfd71 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 31 Jan 2018 10:06:15 +0100
Subject: clean up old subrepo

---
 app/assets/javascripts/srp/package.json | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 app/assets/javascripts/srp/package.json

(limited to 'app/assets/javascripts/srp/package.json')

diff --git a/app/assets/javascripts/srp/package.json b/app/assets/javascripts/srp/package.json
deleted file mode 100644
index 611c187..0000000
--- a/app/assets/javascripts/srp/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "srp_js",
-  "version": "0.4.0",
-  "description": "A secure remote password implementation for JavaScript",
-  "homepage": "https://github.com/leapcode/srp_js#readme",
-  "main": "index.js",
-  "devDependencies": {
-    "jasmine-core": "^2.3.4",
-    "jasmine-jquery": "^2.1.0",
-    "jquery": "^2.1.4",
-    "karma": "^0.13.9",
-    "karma-jasmine": "^0.3.6",
-    "karma-phantomjs-launcher": "^0.2.1",
-    "phantomjs": "^1.9.18",
-    "sinon": "^1.16.1"
-  },
-  "scripts": {
-    "test": "node_modules/karma/bin/karma start --single-run"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/leapcode/srp_js.git"
-  },
-  "author": "LEAP contributors",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/leapcode/srp_js/issues"
-  }
-}
-- 
cgit v1.2.3


From 44f7e6f800dc1f6f2fc29e713bc49e1255856b2e Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 31 Jan 2018 10:06:21 +0100
Subject: git subrepo clone https://leap.se/git/srp_js
 app/assets/javascripts/srp

subrepo:
  subdir:   "app/assets/javascripts/srp"
  merged:   "2088cbe"
upstream:
  origin:   "https://leap.se/git/srp_js"
  branch:   "master"
  commit:   "2088cbe"
git-subrepo:
  version:  "0.3.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a7ee886"
---
 app/assets/javascripts/srp/package.json | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 app/assets/javascripts/srp/package.json

(limited to 'app/assets/javascripts/srp/package.json')

diff --git a/app/assets/javascripts/srp/package.json b/app/assets/javascripts/srp/package.json
new file mode 100644
index 0000000..03b57b1
--- /dev/null
+++ b/app/assets/javascripts/srp/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "srp_js",
+  "version": "0.5.0",
+  "description": "A secure remote password implementation for JavaScript",
+  "homepage": "https://github.com/leapcode/srp_js#readme",
+  "main": "index.js",
+  "devDependencies": {
+    "jasmine-core": "^2.3.4",
+    "jasmine-jquery": "^2.1.0",
+    "jquery": "^3.3.1",
+    "karma": "^2.0.0",
+    "karma-jasmine": "^1.1.1",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "phantomjs-prebuilt": "^2.1.16",
+    "sinon": "^4.2.1"
+  },
+  "scripts": {
+    "test": "node_modules/karma/bin/karma start --single-run"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/leapcode/srp_js.git"
+  },
+  "author": "LEAP contributors",
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/leapcode/srp_js/issues"
+  }
+}
-- 
cgit v1.2.3