summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-09 10:08:13 -0800
committerjessib <jessib@riseup.net>2012-11-09 10:08:13 -0800
commit215a3a0abce42a1f6d303302763c1d4081cc4685 (patch)
tree86b9f1a3058977e63294233852c23e1a627a340f /users/app
parent30f04a24fe0dcbdc779584ec92c1a06801195f86 (diff)
parentca2e1b9f379ccba068ad0ebb852d855f1639cd3a (diff)
Merge branch 'develop' into help_develop
Diffstat (limited to 'users/app')
m---------users/app/assets/javascripts/srp0
1 files changed, 0 insertions, 0 deletions
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
-Subproject 3bf101bc1ef3b5a58fe2f1e2a2e7a681f6de6c0
+Subproject efac662cdf31bc4b61ffb97b8c398e22a86c364