summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-05 09:58:44 -0800
committerjessib <jessib@riseup.net>2012-11-05 09:58:44 -0800
commit3515a598341282c20feb5950a81f43552280688d (patch)
tree74a2d250faeddc76b3b9955c1085282f9cc13956 /users/app
parentfb1c8e60335fefc55191eee16d83f53d2e9a2031 (diff)
parentcf1e7ee20f713068cadf5cfa78840115e0a8a081 (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 23350b54ec2723e1b2e333626567c9fe9d1e264
+Subproject d6a78049f3356d9d645143362eca74434410bf6