summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2014-04-10 17:22:22 +0200
committerAzul <azul@leap.se>2014-04-10 17:33:44 +0200
commitc6a22158c5bfb18fcd83434f92c55436fb15af23 (patch)
tree27b30c6f0fb8eea7101b21111bff073af6ad61ac
parentc1486cb9688d53c5ae266ff22ab279ead12eaa36 (diff)
bringing back srp js
-rw-r--r--.gitmodules4
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/javascripts/leap_web_users/.gitkeep0
m---------app/assets/javascripts/srp0
4 files changed, 2 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 7884a42..0c28cd5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "users/app/assets/javascripts/srp"]
- path = users/app/assets/javascripts/srp
+[submodule "app/assets/javascripts/srp"]
+ path = app/assets/javascripts/srp
url = https://leap.se/git/srp_js
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 03a40da..ab07e1f 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,4 +20,3 @@
//= require platform
//= require tickets
//= require users
-//= require_tree .
diff --git a/app/assets/javascripts/leap_web_users/.gitkeep b/app/assets/javascripts/leap_web_users/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/javascripts/leap_web_users/.gitkeep
+++ /dev/null
diff --git a/app/assets/javascripts/srp b/app/assets/javascripts/srp
new file mode 160000
+Subproject 8f33d32d40b1e21ae7fb9a92c78a275422af421